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

New style AA data loading, still rudimentary

Browse Source
This commit is contained in:
KimLS
2015-06-07 19:42:12 -07:00
parent 03bc245318
commit 3d1dc6314d
12 changed files with 308 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/zone.cpp
+2 -5
View File
@@ -68,7 +68,6 @@ extern bool staticzone;
extern NetConnection net;
extern PetitionList petition_list;
extern QuestParserCollection* parse;
extern uint16 adverrornum;
extern uint32 numclients;
extern WorldServer worldserver;
extern Zone* zone;
@@ -954,15 +953,14 @@ bool Zone::Init(bool iStaticZone) {
zone->LoadNPCEmotes(&NPCEmoteList);
//Load AA information
adverrornum = 500;
LoadAAs();
LoadAlternateAdvancement();
//Load merchant data
adverrornum = 501;
zone->GetMerchantDataForZoneLoad();
//Load temporary merchant data
adverrornum = 502;
zone->LoadTempMerchantData();
// Merc data
@@ -974,7 +972,6 @@ bool Zone::Init(bool iStaticZone) {
if (RuleB(Zone, LevelBasedEXPMods))
zone->LoadLevelEXPMods();
adverrornum = 503;
petition_list.ClearPetitions();
petition_list.ReadDatabase();