From e7cf9f9dbeabc7a91615555e21f8b6236ec04809 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 17 Jul 2018 22:39:04 +0200
Subject: [PATCH] Changed director trigger/function names

---
 src/common/Network/CommonActorControl.h                       | 2 +-
 .../sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp   | 4 ++--
 src/servers/sapphire_zone/Zone/InstanceContent.cpp            | 2 +-
 src/servers/sapphire_zone/Zone/InstanceContent.h              | 2 +-
 src/servers/sapphire_zone/Zone/Zone.h                         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/common/Network/CommonActorControl.h b/src/common/Network/CommonActorControl.h
index 6d600ab2..41f1cb07 100644
--- a/src/common/Network/CommonActorControl.h
+++ b/src/common/Network/CommonActorControl.h
@@ -265,7 +265,7 @@ namespace Core {
 
             DirectorInitFinish = 0x321,
 
-            SomeDirectorEvent = 0x328, // unsure what exactly triggers it, starts director when returning to instance though
+            DirectorSync = 0x328, // unsure what exactly triggers it, starts director when returning to instance though
 
             EnterTerritoryEventFinished = 0x330,
             RequestInstanceLeave = 0x333, // df menu button
diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
index e6a9a32d..bcad5346 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp
@@ -245,9 +245,9 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR
           player.getCurrentZone()->onInitDirector( player );
           break;
        }
-       case ClientTriggerType::SomeDirectorEvent: // Director init finish
+       case ClientTriggerType::DirectorSync: // Director init finish
        {
-          player.getCurrentZone()->onSomeDirectorEvent( player );
+          player.getCurrentZone()->onDirectorSync( player );
           break;
        }
        case ClientTriggerType::EnterTerritoryEventFinished:// this may still be something else. I think i have seen it elsewhere
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index c6c626a8..c920b6b3 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -175,7 +175,7 @@ void Core::InstanceContent::onInitDirector( Entity::Player& player )
    player.setDirectorInitialized( true );
 }
 
-void Core::InstanceContent::onSomeDirectorEvent( Entity::Player& player )
+void Core::InstanceContent::onDirectorSync( Entity::Player& player )
 {
    player.queuePacket( boost::make_shared< ActorControlPacket143 >( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
 }
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index d55fcd82..39c68d4b 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -35,7 +35,7 @@ public:
    void onLeaveTerritory( Entity::Player& player ) override;
    void onFinishLoading( Entity::Player& player ) override;
    void onInitDirector( Entity::Player& player ) override;
-   void onSomeDirectorEvent( Entity::Player& player ) override;
+   void onDirectorSync( Entity::Player& player ) override;
    void onUpdate( uint32_t currTime ) override;
    void onTalk( Entity::Player& player, uint32_t eventId, uint64_t actorId );
    void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override;
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index f632651f..6595618f 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -77,7 +77,7 @@ public:
    virtual void onPlayerZoneIn( Entity::Player &player );
    virtual void onFinishLoading( Entity::Player& player );
    virtual void onInitDirector( Entity::Player& player );
-   virtual void onSomeDirectorEvent( Entity::Player& player ) {};
+   virtual void onDirectorSync( Entity::Player& player ) {};
    virtual void onLeaveTerritory( Entity::Player& player );
    virtual void onUpdate( uint32_t currTime );
    virtual void onRegisterEObj( Entity::EventObjectPtr object ) {};