From f6a4edc6de50aeca52ba926da8adf2b73e34e126 Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 15 Mar 2018 02:36:16 +1100 Subject: [PATCH] magic numbers mason --- src/servers/Scripts/instances/dungeons/Sastasha.cpp | 5 +---- src/servers/sapphire_zone/Zone/InstanceContent.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/servers/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/Scripts/instances/dungeons/Sastasha.cpp index d6c39f0b..cfdd3837 100644 --- a/src/servers/Scripts/instances/dungeons/Sastasha.cpp +++ b/src/servers/Scripts/instances/dungeons/Sastasha.cpp @@ -71,10 +71,7 @@ public: 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 ); + } }; \ No newline at end of file diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp index 9cb85328..603ab4f9 100644 --- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp +++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp @@ -382,8 +382,8 @@ void Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t e if( !hasPlayerPreviouslySpawned( player ) ) { 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 - player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0xA ); + player.directorPlayScene( getDirectorId(), 2, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0x9 ); }