mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-16 22:58:34 +00:00
[Code] WorldContentServer Global to Singleton Cleanup (#4939)
This commit is contained in:
@@ -35,7 +35,6 @@
|
||||
#include "../common/events/player_event_logs.h"
|
||||
#include "../common/evolving_items.h"
|
||||
|
||||
WorldContentService content_service;
|
||||
PlayerEventLogs player_event_logs;
|
||||
|
||||
#ifdef _WINDOWS
|
||||
@@ -165,16 +164,16 @@ int main(int argc, char **argv)
|
||||
}
|
||||
|
||||
|
||||
content_service.SetCurrentExpansion(RuleI(Expansion, CurrentExpansion));
|
||||
content_service.SetDatabase(&database)
|
||||
WorldContentService::Instance()->SetCurrentExpansion(RuleI(Expansion, CurrentExpansion));
|
||||
WorldContentService::Instance()->SetDatabase(&database)
|
||||
->SetContentDatabase(&content_db)
|
||||
->SetExpansionContext()
|
||||
->ReloadContentFlags();
|
||||
|
||||
LogInfo(
|
||||
"Current expansion is [{}] ({})",
|
||||
content_service.GetCurrentExpansion(),
|
||||
content_service.GetCurrentExpansionName()
|
||||
WorldContentService::Instance()->GetCurrentExpansion(),
|
||||
WorldContentService::Instance()->GetCurrentExpansionName()
|
||||
);
|
||||
|
||||
std::string hotfix_name = "";
|
||||
|
||||
Reference in New Issue
Block a user