mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 08:27:46 +00:00
Code Activity

Changed director trigger/function names

Browse source
This commit is contained in:
Mordred 2018-07-17 22:39:04 +02:00
parent 2c242997e6
commit e7cf9f9dbe
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

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

@ -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

2
src/servers/sapphire_zone/Zone/InstanceContent.cpp
View file

@ -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 ) );
}

2
src/servers/sapphire_zone/Zone/InstanceContent.h
View file

@ -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;

2
src/servers/sapphire_zone/Zone/Zone.h
View file

@ -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 ) {};