mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 07:37:45 +00:00
Code Activity

Merge pull request #480 from NotAdam/develop

Browse source 
fix dismount, fix some debug msg formatting
This commit is contained in:
Mordred 2019-01-15 12:13:42 +01:00 • committed by GitHub
commit 1c2da46428
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/common/Network/CommonActorControl.h
View file

@ -204,11 +204,11 @@ enum ActorControlType : uint16_t
SetFestival = 0x386, // param1: festival.exd index SetFestival = 0x386, // param1: festival.exd index
ToggleOrchestrionUnlock = 0x396, ToggleOrchestrionUnlock = 0x396,
Dismount = 0x3A0, Dismount = 0x3A1, // updated 4.5
// Duty Recorder // Duty Recorder
BeginReplayAck = 0x3A1, BeginReplayAck = 0x3A2,
EndReplayAck = 0x3A2, EndReplayAck = 0x3A3,
// Housing // Housing
ShowHousingItemUI = 0x3F7, ShowHousingItemUI = 0x3F7,

2
src/world/Network/GameConnection.cpp
View file

@ -315,7 +315,7 @@ void Sapphire::Network::GameConnection::processOutQueue()
totalSize += pPacket->getSize(); totalSize += pPacket->getSize();
// todo: figure out a good max set size and make it configurable // todo: figure out a good max set size and make it configurable
if( totalSize > 15000 ) if( totalSize > 10000 )
break; break;
} }

6
src/world/Network/Handlers/EventHandlers.cpp
View file

@ -48,7 +48,7 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw,
std::string eventName = "onTalk"; std::string eventName = "onTalk";
std::string objName = pEventMgr->getEventName( eventId ); std::string objName = pEventMgr->getEventName( eventId );
player.sendDebug( "Chara: {0} -> {1} \neventId: {2} ({3:08X}", player.sendDebug( "Chara: {0} -> {1} \neventId: {2} ({3:08X})",
actorId, pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ), actorId, pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ),
eventId, eventId ); eventId, eventId );
@ -90,7 +90,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw,
std::string eventName = "onEmote"; std::string eventName = "onEmote";
std::string objName = pEventMgr->getEventName( eventId ); std::string objName = pEventMgr->getEventName( eventId );
player.sendDebug( "Chara: {0} -> {1} \neventId: {2} ({3:08X}", player.sendDebug( "Chara: {0} -> {1} \neventId: {2} ({3:08X})",
actorId, pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ), actorId, pEventMgr->mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ),
eventId, eventId ); eventId, eventId );
@ -269,7 +269,7 @@ void Sapphire::Network::GameConnection::eventHandlerShop( FrameworkPtr pFw,
std::string eventName = "onOpen"; std::string eventName = "onOpen";
std::string objName = pEventMgr->getEventName( eventId ); std::string objName = pEventMgr->getEventName( eventId );
player.sendDebug( "EventId: {0} ({0:08X}", eventId ); player.sendDebug( "EventId: {0} ({0:08X})", eventId );
player.sendDebug( "Calling: {0}.{1}", objName, eventName ); player.sendDebug( "Calling: {0}.{1}", objName, eventName );
player.eventStart( player.getId(), eventId, Event::EventHandler::UI, 0, packet.data().param ); player.eventStart( player.getId(), eventId, Event::EventHandler::UI, 0, packet.data().param );