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

Another adjustment [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-04-18 19:52:56 -05:00
parent 74c878a481
commit df43a23d98
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/database.h
View File

@ -275,9 +275,10 @@ public:
/* EQEmuLogSys */ /* EQEmuLogSys */
void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings); void LoadLogSettings(EQEmuLogSys::LogSettings* log_settings);
private:
std::map<uint32,std::string> zonename_array; std::map<uint32,std::string> zonename_array;
private:
Mutex Mvarcache; Mutex Mvarcache;
VarCache_Struct varcache; VarCache_Struct varcache;

6
world/main.cpp
View File

@ -327,9 +327,11 @@ int main(int argc, char** argv) {
database.PurgeAllDeletedDataBuckets(); database.PurgeAllDeletedDataBuckets();
LogInfo("Loading zones"); LogInfo("Loading zones");
// Load to both context for now... this needs to be cleaned up and is not the right way to do this
database.LoadZoneNames(); // Load to both context for now... this needs to be cleaned up as this has always been cludgy
content_db.LoadZoneNames(); content_db.LoadZoneNames();
database.zonename_array = content_db.zonename_array;
LogInfo("Clearing groups"); LogInfo("Clearing groups");
database.ClearGroup(); database.ClearGroup();
LogInfo("Clearing raids"); LogInfo("Clearing raids");

5
zone/main.cpp
View File

@ -313,9 +313,10 @@ int main(int argc, char** argv) {
} }
LogInfo("Loading zone names"); LogInfo("Loading zone names");
// Load to both context for now... this needs to be cleaned up and is not the right way to do this
database.LoadZoneNames(); // Load to both context for now... this needs to be cleaned up as this has always been cludgy
content_db.LoadZoneNames(); content_db.LoadZoneNames();
database.zonename_array = content_db.zonename_array;
LogInfo("Loading items"); LogInfo("Loading items");
if (!database.LoadItems(hotfix_name)) { if (!database.LoadItems(hotfix_name)) {