From efab7386606c669a27a197e6b59c8e634cb57143 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Tue, 15 Jan 2019 18:20:21 +1100 Subject: [PATCH 1/3] fix some event debug message formatting --- src/world/Network/GameConnection.cpp | 2 +- src/world/Network/Handlers/EventHandlers.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp index d1f2a61c..13523dcd 100644 --- a/src/world/Network/GameConnection.cpp +++ b/src/world/Network/GameConnection.cpp @@ -315,7 +315,7 @@ void Sapphire::Network::GameConnection::processOutQueue() totalSize += pPacket->getSize(); // todo: figure out a good max set size and make it configurable - if( totalSize > 15000 ) + if( totalSize > 10000 ) break; } diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp index 85cfe10d..1ac24e5d 100644 --- a/src/world/Network/Handlers/EventHandlers.cpp +++ b/src/world/Network/Handlers/EventHandlers.cpp @@ -48,7 +48,7 @@ void Sapphire::Network::GameConnection::eventHandlerTalk( FrameworkPtr pFw, std::string eventName = "onTalk"; 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 ) ), eventId, eventId ); @@ -90,7 +90,7 @@ void Sapphire::Network::GameConnection::eventHandlerEmote( FrameworkPtr pFw, std::string eventName = "onEmote"; 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 ) ), eventId, eventId ); @@ -269,7 +269,7 @@ void Sapphire::Network::GameConnection::eventHandlerShop( FrameworkPtr pFw, std::string eventName = "onOpen"; 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.eventStart( player.getId(), eventId, Event::EventHandler::UI, 0, packet.data().param ); From 30c329ee1f7b8f1cf0274b42b14017ea1828b456 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Tue, 15 Jan 2019 19:13:36 +1100 Subject: [PATCH 2/3] fix dismount actrl --- src/common/Network/CommonActorControl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index 32a00705..757355f3 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -204,7 +204,7 @@ enum ActorControlType : uint16_t SetFestival = 0x386, // param1: festival.exd index ToggleOrchestrionUnlock = 0x396, - Dismount = 0x3A0, + Dismount = 0x3A1, // updated 4.5 // Duty Recorder BeginReplayAck = 0x3A1, From 3793b16b366763245c80d99a91af031d96026df3 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Tue, 15 Jan 2019 20:10:35 +1100 Subject: [PATCH 3/3] potentially fix shifted dutyrecorder actorcontrols --- src/common/Network/CommonActorControl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index 757355f3..b853f07f 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -207,8 +207,8 @@ enum ActorControlType : uint16_t Dismount = 0x3A1, // updated 4.5 // Duty Recorder - BeginReplayAck = 0x3A1, - EndReplayAck = 0x3A2, + BeginReplayAck = 0x3A2, + EndReplayAck = 0x3A3, // Housing ShowHousingItemUI = 0x3F7,