pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-03 08:00:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Code] AdventureManager Global to Singleton Cleanup (#4931)

Browse Source 
* [Code] AdventureManager Global to Singleton Cleanup

* Post merge fix

---------

Co-authored-by: Chris Miles <akkadius1@gmail.com>
This commit is contained in:
Alex King
2025-06-25 15:38:24 -04:00
committed by GitHub
parent 128732e05d
commit 004e2ca63f
6 changed files with 26 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/adventure.cpp
+5 -5
View File
@@ -17,7 +17,7 @@
extern ZSList zoneserver_list;
extern ClientList client_list;
extern AdventureManager adventure_manager;
extern EQ::Random emu_random;
Adventure::Adventure(AdventureTemplate *t)
{
@@ -215,7 +215,7 @@ void Adventure::SetStatus(AdventureStatus new_status)
auto iter = players.begin();
while(iter != players.end())
{
adventure_manager.GetAdventureData((*iter).c_str());
AdventureManager::Instance()->GetAdventureData((*iter).c_str());
++iter;
}
}
@@ -330,7 +330,7 @@ void Adventure::Finished(AdventureWinStatus ws)
afe.win = false;
afe.points = 0;
}
adventure_manager.AddFinishedEvent(afe);
AdventureManager::Instance()->AddFinishedEvent(afe);
database.UpdateAdventureStatsEntry(character_id, GetTemplate()->theme, (ws != AWS_Lose) ? true : false);
}
}
@@ -351,12 +351,12 @@ void Adventure::Finished(AdventureWinStatus ws)
afe.win = false;
afe.points = 0;
}
adventure_manager.AddFinishedEvent(afe);
AdventureManager::Instance()->AddFinishedEvent(afe);
database.UpdateAdventureStatsEntry(character_id, GetTemplate()->theme, (ws != AWS_Lose) ? true : false);
}
++iter;
}
adventure_manager.GetAdventureData(this);
AdventureManager::Instance()->GetAdventureData(this);
}
void Adventure::MoveCorpsesToGraveyard()