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

Rename getActiveBNpcByInstanceIdAndTriggerOwner to getActiveBNpcByLayoutIdAndTriggerOwner

Browse source
This commit is contained in:
Mordred 2022-02-23 10:25:35 +01:00
parent bb6381d15c
commit 227d5f8070
17 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/scripts/quest/subquest/blackshroud_east/GaiUsa004.cpp
View file

@ -176,7 +176,7 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemy0Spawned ) if( !enemy0Spawned )
{ {

2
src/scripts/quest/subquest/blackshroud_east/GaiUsa308.cpp
View file

@ -281,7 +281,7 @@ private:
void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00012Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned ) if( !enemySpawned )
{ {
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() ); auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );

2
src/scripts/quest/subquest/blackshroud_north/GaiUsa802.cpp
View file

@ -142,7 +142,7 @@ private:
{ {
quest.setBitFlag8( 1, true ); quest.setBitFlag8( 1, true );
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned ) if( !enemySpawned )
{ {

2
src/scripts/quest/subquest/blackshroud_north/GaiUsa904.cpp
View file

@ -161,7 +161,7 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); 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) if( !enemySpawned && quest.getUI8AL() < 1)
{ {

2
src/scripts/quest/subquest/blackshroud_south/GaiUsa702.cpp
View file

@ -158,7 +158,7 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned ) if( !enemySpawned )
{ {

2
src/scripts/quest/subquest/blackshroud_south/GaiUsb012.cpp
View file

@ -165,7 +165,7 @@ private:
void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result ) void Scene00003Return( World::Quest& quest, Entity::Player& player, const Event::SceneResult& result )
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned ) if( !enemySpawned )
{ {
auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() ); auto enemy = instance->createBNpcFromLayoutId( Enemy0, 413 /*TODO: Find the right value*/, Common::BNpcType::Enemy, player.getId() );

4
src/scripts/quest/subquest/coerthas_central/GaiUsb604.cpp
View file

@ -124,8 +124,8 @@ public:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2 ) if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2 )
Scene00002( quest, player ); Scene00002( quest, player );

6
src/scripts/quest/subquest/coerthas_central/GaiUsb607.cpp
View file

@ -195,9 +195,9 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
auto enemy2spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy2, player.getId() ); auto enemy2spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy2, player.getId() );
if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8BL() < 3 ) if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8BL() < 3 )
{ {

6
src/scripts/quest/subquest/coerthas_central/GaiUsb701.cpp
View file

@ -138,9 +138,9 @@ private:
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
auto enemy2spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy2, player.getId() ); auto enemy2spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy2, player.getId() );
if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8AL() < 3 ) if( !enemy0spawned && !enemy1spawned && !enemy2spawned && quest.getUI8AL() < 3 )
{ {

2
src/scripts/quest/subquest/coerthas_central/GaiUsb801.cpp
View file

@ -187,7 +187,7 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned ) if( !enemySpawned )
{ {

4
src/scripts/quest/subquest/coerthas_central/GaiUsb903.cpp
View file

@ -153,8 +153,8 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2) if( !enemy0Spawned && !enemy1Spawned && quest.getUI8AL() < 2)
{ {

2
src/scripts/quest/subquest/coerthas_central/GaiUsb904.cpp
View file

@ -199,7 +199,7 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemySpawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemySpawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
if( !enemySpawned ) if( !enemySpawned )
{ {

4
src/scripts/quest/subquest/thanalan_east/SubWil110.cpp
View file

@ -284,8 +284,8 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
if( !enemy0Spawned && !enemy1Spawned ) if( !enemy0Spawned && !enemy1Spawned )
{ {

8
src/scripts/quest/subquest/thanalan_east/SubWil113.cpp
View file

@ -105,8 +105,8 @@ public:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
if( enemy0Spawned || enemy1Spawned ) if( enemy0Spawned || enemy1Spawned )
Scene00008( quest, player ); Scene00008( quest, player );
@ -244,8 +244,8 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
if( !enemy0Spawned && !enemy1Spawned ) if( !enemy0Spawned && !enemy1Spawned )
{ {

4
src/scripts/quest/subquest/thanalan_south/GaiUsa705.cpp
View file

@ -150,8 +150,8 @@ private:
{ {
auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() ); auto instance = teriMgr().getTerritoryByGuId( player.getTerritoryId() );
auto enemy0Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy0, player.getId() ); auto enemy0Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy0, player.getId() );
auto enemy1Spawned = instance->getActiveBNpcByInstanceIdAndTriggerOwner( Enemy1, player.getId() ); auto enemy1Spawned = instance->getActiveBNpcByLayoutIdAndTriggerOwner( Enemy1, player.getId() );
if( !enemy0Spawned && !enemy1Spawned ) if( !enemy0Spawned && !enemy1Spawned )
{ {

2
src/world/Territory/Territory.cpp
View file

@ -853,7 +853,7 @@ Entity::BNpcPtr Territory::getActiveBNpcByLayoutId( uint32_t instanceId )
return nullptr; 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 ) for( const auto& bnpcIt : m_bNpcMap )
{ {

2
src/world/Territory/Territory.h
View file

@ -180,7 +180,7 @@ namespace Sapphire
Entity::BNpcPtr getActiveBNpcByLayoutId( uint32_t instanceId ); 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 ); Entity::EventObjectPtr getEObj( uint32_t objId );