From 5e280c9d05fb53f4023fc637a78b984b9bc36f4e Mon Sep 17 00:00:00 2001 From: Mordred Date: Tue, 3 Jul 2018 23:25:44 +0200 Subject: [PATCH] Added another trigger def and removed some debug prints --- src/common/Network/CommonActorControl.h | 1 + src/servers/sapphire_zone/Zone/Cell.cpp | 2 -- src/servers/sapphire_zone/Zone/Zone.cpp | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h index 937eed2a..2ab573d5 100644 --- a/src/common/Network/CommonActorControl.h +++ b/src/common/Network/CommonActorControl.h @@ -250,6 +250,7 @@ namespace Core { RequestChocoboInventory = 0x1C4, EmoteReq = 0x1F4, + EmoteCancel = 0x1F6, PersistantEmoteCancel = 0x1F7, PoseChange = 0x1F9, PoseReapply = 0x1FA, diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp index 899fdc4c..5f1feb1b 100644 --- a/src/servers/sapphire_zone/Zone/Cell.cpp +++ b/src/servers/sapphire_zone/Zone/Cell.cpp @@ -37,7 +37,6 @@ void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone ) void Core::Cell::addActor( Entity::ActorPtr pAct ) { auto pLog = g_fw.get< Core::Logger >(); - pLog->debug( "Adding actor to cell in " + this->m_pZone->getName() ); if( pAct->isPlayer() ) ++m_playerCount; @@ -47,7 +46,6 @@ void Core::Cell::addActor( Entity::ActorPtr pAct ) void Core::Cell::removeActor( Entity::ActorPtr pAct ) { auto pLog = g_fw.get< Core::Logger >(); - pLog->debug( "Removing actor from cell in " + this->m_pZone->getName() ); if( pAct->isPlayer() ) --m_playerCount; diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp index 91bcd612..f9cfb9a5 100644 --- a/src/servers/sapphire_zone/Zone/Zone.cpp +++ b/src/servers/sapphire_zone/Zone/Zone.cpp @@ -550,7 +550,6 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor ) if( pOldCell ) { auto pLog = g_fw.get< Logger >(); - pLog->debug( std::string( __FUNCTION__ ) + " -> removeActor() ...moving cell..." ); pOldCell->removeActor( actor.shared_from_this() ); }