From 227d5f807083bff7fa47bde8d1a09541f35ed461 Mon Sep 17 00:00:00 2001 From: Mordred Date: Wed, 23 Feb 2022 10:25:35 +0100 Subject: [PATCH] Rename getActiveBNpcByInstanceIdAndTriggerOwner to getActiveBNpcByLayoutIdAndTriggerOwner --- src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp | 2 +- src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp | 2 +- .../quest/subquest/blackshroud_north/GaiUsa802.cpp | 2 +- .../quest/subquest/blackshroud_north/GaiUsa904.cpp | 2 +- .../quest/subquest/blackshroud_south/GaiUsa702.cpp | 2 +- .../quest/subquest/blackshroud_south/GaiUsb012.cpp | 2 +- src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp | 4 ++-- src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp | 6 +++--- src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp | 6 +++--- src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp | 2 +- src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp | 4 ++-- src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp | 2 +- src/scripts/quest/subquest/thanalan_east/SubWil110.cpp | 4 ++-- src/scripts/quest/subquest/thanalan_east/SubWil113.cpp | 8 ++++---- src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp | 4 ++-- src/world/Territory/Territory.cpp | 2 +- src/world/Territory/Territory.h | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp index 0e12ad31..3a25dcae 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp @@ -176,7 +176,7 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemy0Spawned ) { diff --git a/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp b/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp index 705d6e34..2aa55113 100644 --- a/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp +++ b/src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp @@ -281,7 +281,7 @@ private: void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned ) { auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() ); diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp index e2ec2dbe..f4605cb6 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp @@ -142,7 +142,7 @@ private: { quest.setBitFlag8( 1, true ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned ) { diff --git a/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp b/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp index c19cdaed..ebe0e9d5 100644 --- a/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp +++ b/src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp @@ -161,7 +161,7 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned && quest.getUI8AL() < 1) { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp index 0180dffb..c6ccb85f 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp @@ -158,7 +158,7 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned ) { diff --git a/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp b/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp index 861e2841..8077b6f3 100644 --- a/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp +++ b/src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp @@ -165,7 +165,7 @@ private: void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned ) { auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() ); diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp index 9c7f65fe..85c67404 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp @@ -124,8 +124,8 @@ public: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2 ) Scene00002( quest, player ); diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp index 50ff05a6..88961341 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp @@ -195,9 +195,9 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); - auto enemy2spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy2, player.getId() ); + auto enemy0spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy2spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy2, player.getId() ); if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8BL() < 3 ) { diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp index 4c0f2949..6c5ecc3b 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp @@ -138,9 +138,9 @@ private: auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); - auto enemy2spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy2, player.getId() ); + auto enemy0spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy2spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy2, player.getId() ); if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8AL() < 3 ) { diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp index 00cc68dc..c15bb55a 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp @@ -187,7 +187,7 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned ) { diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp index 906ea263..269412b9 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp @@ -153,8 +153,8 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2) { diff --git a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp index cbf7fa5f..1fb9bc17 100644 --- a/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp +++ b/src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp @@ -199,7 +199,7 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); if( !enemySpawned ) { diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp index b9b51f1c..e3bc2400 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil110.cpp @@ -284,8 +284,8 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); if( !enemy0Spawned && !enemy1Spawned ) { diff --git a/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp b/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp index 059f665e..87b479e4 100644 --- a/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp +++ b/src/scripts/quest/subquest/thanalan_east/SubWil113.cpp @@ -105,8 +105,8 @@ public: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); if( enemy0Spawned || enemy1Spawned ) Scene00008( quest, player ); @@ -244,8 +244,8 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); if( !enemy0Spawned && !enemy1Spawned ) { diff --git a/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp b/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp index 7d10f6af..8c91c934 100644 --- a/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp +++ b/src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp @@ -150,8 +150,8 @@ private: { auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); - auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); - auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); + auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() ); + auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() ); if( !enemy0Spawned && !enemy1Spawned ) { diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp index cc1a5db4..c7d1d94a 100644 --- a/src/world/Territory/Territory.cpp +++ b/src/world/Territory/Territory.cpp @@ -853,7 +853,7 @@ Entity::BNpcPtr Territory::getActiveBNpcByLayoutId( uint32_t instanceId ) return nullptr; } -Entity::BNpcPtr Territory::getActiveBNpcByInstanceIdAndTriggerOwner( uint32_t instanceId, uint32_t triggerOwnerId ) +Entity::BNpcPtr Territory::getActiveBNpcByLayoutIdAndTriggerOwner( uint32_t instanceId, uint32_t triggerOwnerId ) { for( const auto& bnpcIt : m_bNpcMap ) { diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h index 32db98fb..8caf56b0 100644 --- a/src/world/Territory/Territory.h +++ b/src/world/Territory/Territory.h @@ -180,7 +180,7 @@ namespace Sapphire Entity::BNpcPtr getActiveBNpcByLayoutId( uint32_t instanceId ); - Entity::BNpcPtr getActiveBNpcByInstanceIdAndTriggerOwner( uint32_t instanceId, uint32_t triggerOwnerId ); + Entity::BNpcPtr getActiveBNpcByLayoutIdAndTriggerOwner( uint32_t instanceId, uint32_t triggerOwnerId ); Entity::EventObjectPtr getEObj( uint32_t objId );