mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

minor refactoring

Browse source
This commit is contained in:
NotAdam 2018-07-22 23:32:16 +10:00
parent 9ab7d5c68a
commit b8871519fe
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/Network/PacketDef/Zone/ClientZoneDef.h
View file

@ -66,7 +66,7 @@ struct FFXIVIpcEventHandlerReturn : FFXIVIpcBasePacket< ReturnEventHandler >
/* 000A */ char pad_000A[2]; /* 000A */ char pad_000A[2];
/* 000C */ uint16_t param3; /* 000C */ uint16_t param3;
/* 000E */ char pad_000E[2]; /* 000E */ char pad_000E[2];
/* 0010 */ uint16_t tradeQuantity; /* 0010 */ uint16_t param4;
}; };
struct FFXIVIpcEnterTerritoryHandler : FFXIVIpcBasePacket< EnterTeriEventHandler > struct FFXIVIpcEnterTerritoryHandler : FFXIVIpcBasePacket< EnterTeriEventHandler >

2
src/servers/Scripts/common/GilShop.cpp
View file

@ -16,7 +16,7 @@ public:
{ {
//player.playGilShop( result.eventId, HIDE_HOTBAR | NO_DEFAULT_CAMERA, shopInteractionCallback ); //player.playGilShop( result.eventId, HIDE_HOTBAR | NO_DEFAULT_CAMERA, shopInteractionCallback );
player.sendDebug("got tradeQuantity: " + std::to_string( result.tradeQuantity ) ); player.sendDebug("got tradeQuantity: " + std::to_string( result.param4 ) );
player.playScene( result.eventId, 10, SCENE_FLAGS, 0, 0, shopInteractionCallback ); player.playScene( result.eventId, 10, SCENE_FLAGS, 0, 0, shopInteractionCallback );
return; return;
} }

2
src/servers/sapphire_zone/Event/EventHandler.h
View file

@ -12,7 +12,7 @@ namespace Core {
uint16_t param1; uint16_t param1;
uint16_t param2; uint16_t param2;
uint16_t param3; uint16_t param3;
uint16_t tradeQuantity; uint16_t param4;
}; };
class EventHandler class EventHandler

4
src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
View file

@ -203,7 +203,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_
const auto& param1 = packet.data().param1; const auto& param1 = packet.data().param1;
const auto& param2 = packet.data().param2; const auto& param2 = packet.data().param2;
const auto& param3 = packet.data().param3; const auto& param3 = packet.data().param3;
const auto& tradeQuantity = packet.data().tradeQuantity; const auto& param4 = packet.data().param4;
std::string eventName = Event::getEventName( eventId ); std::string eventName = Event::getEventName( eventId );
@ -229,7 +229,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_
result.param1 = param1; result.param1 = param1;
result.param2 = param2; result.param2 = param2;
result.param3 = param3; result.param3 = param3;
result.tradeQuantity = tradeQuantity; result.param4 = param4;
eventCallback( player, result ); eventCallback( player, result );
} }
// we might have a scene chain callback instead so check for that too // we might have a scene chain callback instead so check for that too