mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

magic numbers mason

Browse source
This commit is contained in:
Adam 2018-03-15 02:36:16 +11:00
parent 22faac5d06
commit f6a4edc6de
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/servers/Scripts/instances/dungeons/Sastasha.cpp
View file

@ -71,10 +71,7 @@ public:
void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override void onEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
{ {
if( !instance->hasPlayerPreviouslySpawned( player ) )
player.directorPlayScene( getId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR | CONDITION_CUTSCENE, 0, 0xA );
else
player.directorPlayScene( getId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0xA );
} }
}; };

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

@ -382,8 +382,8 @@ void Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t e
if( !hasPlayerPreviouslySpawned( player ) ) if( !hasPlayerPreviouslySpawned( player ) )
{ {
m_spawnedPlayers.insert( player.getId() ); m_spawnedPlayers.insert( player.getId() );
player.directorPlayScene( getDirectorId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR | CONDITION_CUTSCENE, 0, 0xA ); player.directorPlayScene( getDirectorId(), 1, 139699201, 0, 0x9 );
} }
else else
player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0xA ); player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0x9 );
} }