* Some singleton renames for consistency:
accmgr -> AccountMgr objmgr -> ObjectMgr auctionmgr -> sAuctionMgr spellmgr -> sSpellMgr CreatureEAI_Mgr -> sEventAIMgr achievementmgr -> sAchievementMgr gameeventmgr -> sGameEventMgr sInstanceSaveManager -> sInstanceSaveMgr poolhandler -> sPoolMgr --HG-- branch : trunk
This commit is contained in:
XTZGZoReX
+120
-120
@@ -1233,7 +1233,7 @@ void World::SetInitialWorldSettings()
|
||||
LoadConfigSettings();
|
||||
|
||||
///- Init highest guids before any table loading to prevent using not initialized guids in some code.
|
||||
objmgr.SetHighestGuids();
|
||||
sObjectMgr.SetHighestGuids();
|
||||
|
||||
///- Check the existence of the map files for all races' startup areas.
|
||||
if (!MapManager::ExistMapAndVMap(0,-6240.32f, 331.033f)
|
||||
@@ -1252,7 +1252,7 @@ void World::SetInitialWorldSettings()
|
||||
///- Loading strings. Getting no records means core load has to be canceled because no error message can be output.
|
||||
sLog.outString();
|
||||
sLog.outString("Loading Trinity strings...");
|
||||
if (!objmgr.LoadTrinityStrings())
|
||||
if (!sObjectMgr.LoadTrinityStrings())
|
||||
exit(1); // Error message displayed in function already
|
||||
|
||||
///- Update the realm entry in the database with the realm type from the config file
|
||||
@@ -1272,73 +1272,73 @@ void World::SetInitialWorldSettings()
|
||||
DetectDBCLang();
|
||||
|
||||
sLog.outString("Loading Script Names...");
|
||||
objmgr.LoadScriptNames();
|
||||
sObjectMgr.LoadScriptNames();
|
||||
|
||||
sLog.outString("Loading Instance Template...");
|
||||
objmgr.LoadInstanceTemplate();
|
||||
sObjectMgr.LoadInstanceTemplate();
|
||||
|
||||
sLog.outString("Loading SkillLineAbilityMultiMap Data...");
|
||||
spellmgr.LoadSkillLineAbilityMap();
|
||||
sSpellMgr.LoadSkillLineAbilityMap();
|
||||
|
||||
///- Clean up and pack instances
|
||||
sLog.outString("Cleaning up instances...");
|
||||
sInstanceSaveManager.CleanupInstances(); // must be called before `creature_respawn`/`gameobject_respawn` tables
|
||||
sInstanceSaveMgr.CleanupInstances(); // must be called before `creature_respawn`/`gameobject_respawn` tables
|
||||
|
||||
sLog.outString("Packing instances...");
|
||||
sInstanceSaveManager.PackInstances();
|
||||
sInstanceSaveMgr.PackInstances();
|
||||
|
||||
sLog.outString("Loading Localization strings...");
|
||||
objmgr.LoadCreatureLocales();
|
||||
objmgr.LoadGameObjectLocales();
|
||||
objmgr.LoadItemLocales();
|
||||
objmgr.LoadItemSetNameLocales();
|
||||
objmgr.LoadQuestLocales();
|
||||
objmgr.LoadNpcTextLocales();
|
||||
objmgr.LoadPageTextLocales();
|
||||
objmgr.LoadGossipMenuItemsLocales();
|
||||
objmgr.LoadPointOfInterestLocales();
|
||||
objmgr.SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts)
|
||||
sObjectMgr.LoadCreatureLocales();
|
||||
sObjectMgr.LoadGameObjectLocales();
|
||||
sObjectMgr.LoadItemLocales();
|
||||
sObjectMgr.LoadItemSetNameLocales();
|
||||
sObjectMgr.LoadQuestLocales();
|
||||
sObjectMgr.LoadNpcTextLocales();
|
||||
sObjectMgr.LoadPageTextLocales();
|
||||
sObjectMgr.LoadGossipMenuItemsLocales();
|
||||
sObjectMgr.LoadPointOfInterestLocales();
|
||||
sObjectMgr.SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts)
|
||||
sLog.outString(">>> Localization strings loaded");
|
||||
sLog.outString();
|
||||
|
||||
sLog.outString("Loading Page Texts...");
|
||||
objmgr.LoadPageTexts();
|
||||
sObjectMgr.LoadPageTexts();
|
||||
|
||||
sLog.outString("Loading Game Object Templates..."); // must be after LoadPageTexts
|
||||
objmgr.LoadGameobjectInfo();
|
||||
sObjectMgr.LoadGameobjectInfo();
|
||||
|
||||
sLog.outString("Loading Spell Rank Data...");
|
||||
spellmgr.LoadSpellRanks();
|
||||
sSpellMgr.LoadSpellRanks();
|
||||
|
||||
sLog.outString("Loading Spell Required Data...");
|
||||
spellmgr.LoadSpellRequired();
|
||||
sSpellMgr.LoadSpellRequired();
|
||||
|
||||
sLog.outString("Loading Spell Group types...");
|
||||
spellmgr.LoadSpellGroups();
|
||||
sSpellMgr.LoadSpellGroups();
|
||||
|
||||
sLog.outString("Loading Spell Learn Skills...");
|
||||
spellmgr.LoadSpellLearnSkills(); // must be after LoadSpellRanks
|
||||
sSpellMgr.LoadSpellLearnSkills(); // must be after LoadSpellRanks
|
||||
|
||||
sLog.outString("Loading Spell Learn Spells...");
|
||||
spellmgr.LoadSpellLearnSpells();
|
||||
sSpellMgr.LoadSpellLearnSpells();
|
||||
|
||||
sLog.outString("Loading Spell Proc Event conditions...");
|
||||
spellmgr.LoadSpellProcEvents();
|
||||
sSpellMgr.LoadSpellProcEvents();
|
||||
|
||||
sLog.outString("Loading Spell Bonus Data...");
|
||||
spellmgr.LoadSpellBonusess();
|
||||
sSpellMgr.LoadSpellBonusess();
|
||||
|
||||
sLog.outString("Loading Aggro Spells Definitions...");
|
||||
spellmgr.LoadSpellThreats();
|
||||
sSpellMgr.LoadSpellThreats();
|
||||
|
||||
sLog.outString("Loading Spell Group Stack Rules...");
|
||||
spellmgr.LoadSpellGroupStackRules();
|
||||
sSpellMgr.LoadSpellGroupStackRules();
|
||||
|
||||
sLog.outString("Loading NPC Texts...");
|
||||
objmgr.LoadGossipText();
|
||||
sObjectMgr.LoadGossipText();
|
||||
|
||||
sLog.outString("Loading Enchant Spells Proc datas...");
|
||||
spellmgr.LoadSpellEnchantProcData();
|
||||
sSpellMgr.LoadSpellEnchantProcData();
|
||||
|
||||
sLog.outString("Loading Item Random Enchantments Table...");
|
||||
LoadRandomEnchantmentsTable();
|
||||
@@ -1347,144 +1347,144 @@ void World::SetInitialWorldSettings()
|
||||
sDisableMgr.LoadDisables(); // must be before loading quests and items
|
||||
|
||||
sLog.outString("Loading Items..."); // must be after LoadRandomEnchantmentsTable and LoadPageTexts
|
||||
objmgr.LoadItemPrototypes();
|
||||
sObjectMgr.LoadItemPrototypes();
|
||||
|
||||
sLog.outString("Loading Item set names..."); // must be after LoadItemPrototypes
|
||||
objmgr.LoadItemSetNames();
|
||||
sObjectMgr.LoadItemSetNames();
|
||||
|
||||
sLog.outString("Loading Creature Model Based Info Data...");
|
||||
objmgr.LoadCreatureModelInfo();
|
||||
sObjectMgr.LoadCreatureModelInfo();
|
||||
|
||||
sLog.outString("Loading Equipment templates...");
|
||||
objmgr.LoadEquipmentTemplates();
|
||||
sObjectMgr.LoadEquipmentTemplates();
|
||||
|
||||
sLog.outString("Loading Creature templates...");
|
||||
objmgr.LoadCreatureTemplates();
|
||||
sObjectMgr.LoadCreatureTemplates();
|
||||
|
||||
sLog.outString("Loading Reputation Reward Rates...");
|
||||
objmgr.LoadReputationRewardRate();
|
||||
sObjectMgr.LoadReputationRewardRate();
|
||||
|
||||
sLog.outString("Loading Creature Reputation OnKill Data...");
|
||||
objmgr.LoadReputationOnKill();
|
||||
sObjectMgr.LoadReputationOnKill();
|
||||
|
||||
sLog.outString( "Loading Reputation Spillover Data..." );
|
||||
objmgr.LoadReputationSpilloverTemplate();
|
||||
sObjectMgr.LoadReputationSpilloverTemplate();
|
||||
|
||||
sLog.outString("Loading Points Of Interest Data...");
|
||||
objmgr.LoadPointsOfInterest();
|
||||
sObjectMgr.LoadPointsOfInterest();
|
||||
|
||||
sLog.outString("Loading Creature Base Stats...");
|
||||
objmgr.LoadCreatureClassLevelStats();
|
||||
sObjectMgr.LoadCreatureClassLevelStats();
|
||||
|
||||
sLog.outString("Loading Creature Data...");
|
||||
objmgr.LoadCreatures();
|
||||
sObjectMgr.LoadCreatures();
|
||||
|
||||
sLog.outString("Loading Creature Linked Respawn...");
|
||||
objmgr.LoadCreatureLinkedRespawn(); // must be after LoadCreatures()
|
||||
sObjectMgr.LoadCreatureLinkedRespawn(); // must be after LoadCreatures()
|
||||
|
||||
sLog.outString("Loading pet levelup spells...");
|
||||
spellmgr.LoadPetLevelupSpellMap();
|
||||
sSpellMgr.LoadPetLevelupSpellMap();
|
||||
|
||||
sLog.outString("Loading pet default spell additional to levelup spells...");
|
||||
spellmgr.LoadPetDefaultSpells();
|
||||
sSpellMgr.LoadPetDefaultSpells();
|
||||
|
||||
sLog.outString("Loading Creature Template Addon Data...");
|
||||
objmgr.LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures()
|
||||
sObjectMgr.LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures()
|
||||
|
||||
sLog.outString("Loading Vehicle Accessories...");
|
||||
objmgr.LoadVehicleAccessories(); // must be after LoadCreatureTemplates()
|
||||
sObjectMgr.LoadVehicleAccessories(); // must be after LoadCreatureTemplates()
|
||||
|
||||
sLog.outString("Loading Creature Respawn Data..."); // must be after PackInstances()
|
||||
objmgr.LoadCreatureRespawnTimes();
|
||||
sObjectMgr.LoadCreatureRespawnTimes();
|
||||
|
||||
sLog.outString("Loading Gameobject Data...");
|
||||
objmgr.LoadGameobjects();
|
||||
sObjectMgr.LoadGameobjects();
|
||||
|
||||
sLog.outString("Loading Gameobject Respawn Data..."); // must be after PackInstances()
|
||||
objmgr.LoadGameobjectRespawnTimes();
|
||||
sObjectMgr.LoadGameobjectRespawnTimes();
|
||||
|
||||
sLog.outString("Loading Objects Pooling Data...");
|
||||
poolhandler.LoadFromDB();
|
||||
sPoolMgr.LoadFromDB();
|
||||
|
||||
sLog.outString("Loading Game Event Data...");
|
||||
gameeventmgr.LoadFromDB();
|
||||
sGameEventMgr.LoadFromDB();
|
||||
|
||||
sLog.outString("Loading Weather Data...");
|
||||
sWeatherMgr.LoadWeatherData();
|
||||
|
||||
sLog.outString("Loading Quests...");
|
||||
objmgr.LoadQuests(); // must be loaded after DBCs, creature_template, item_template, gameobject tables
|
||||
sObjectMgr.LoadQuests(); // must be loaded after DBCs, creature_template, item_template, gameobject tables
|
||||
|
||||
sLog.outString("Checking Quest Disables");
|
||||
sDisableMgr.CheckQuestDisables(); // must be after loading quests
|
||||
|
||||
sLog.outString("Loading Quest POI");
|
||||
objmgr.LoadQuestPOI();
|
||||
sObjectMgr.LoadQuestPOI();
|
||||
|
||||
sLog.outString("Loading Quests Relations...");
|
||||
objmgr.LoadQuestRelations(); // must be after quest load
|
||||
sObjectMgr.LoadQuestRelations(); // must be after quest load
|
||||
|
||||
sLog.outString("Loading UNIT_NPC_FLAG_SPELLCLICK Data...");
|
||||
objmgr.LoadNPCSpellClickSpells();
|
||||
sObjectMgr.LoadNPCSpellClickSpells();
|
||||
|
||||
sLog.outString("Loading SpellArea Data..."); // must be after quest load
|
||||
spellmgr.LoadSpellAreas();
|
||||
sSpellMgr.LoadSpellAreas();
|
||||
|
||||
sLog.outString("Loading AreaTrigger definitions...");
|
||||
objmgr.LoadAreaTriggerTeleports();
|
||||
sObjectMgr.LoadAreaTriggerTeleports();
|
||||
|
||||
sLog.outString("Loading Access Requirements...");
|
||||
objmgr.LoadAccessRequirements(); // must be after item template load
|
||||
sObjectMgr.LoadAccessRequirements(); // must be after item template load
|
||||
|
||||
sLog.outString("Loading Quest Area Triggers...");
|
||||
objmgr.LoadQuestAreaTriggers(); // must be after LoadQuests
|
||||
sObjectMgr.LoadQuestAreaTriggers(); // must be after LoadQuests
|
||||
|
||||
sLog.outString("Loading Tavern Area Triggers...");
|
||||
objmgr.LoadTavernAreaTriggers();
|
||||
sObjectMgr.LoadTavernAreaTriggers();
|
||||
|
||||
sLog.outString("Loading AreaTrigger script names...");
|
||||
objmgr.LoadAreaTriggerScripts();
|
||||
sObjectMgr.LoadAreaTriggerScripts();
|
||||
|
||||
sLog.outString("Loading Graveyard-zone links...");
|
||||
objmgr.LoadGraveyardZones();
|
||||
sObjectMgr.LoadGraveyardZones();
|
||||
|
||||
sLog.outString("Loading Spell target coordinates...");
|
||||
spellmgr.LoadSpellTargetPositions();
|
||||
sSpellMgr.LoadSpellTargetPositions();
|
||||
|
||||
sLog.outString("Loading spell pet auras...");
|
||||
spellmgr.LoadSpellPetAuras();
|
||||
sSpellMgr.LoadSpellPetAuras();
|
||||
|
||||
sLog.outString("Loading spell extra attributes...");
|
||||
spellmgr.LoadSpellCustomAttr();
|
||||
sSpellMgr.LoadSpellCustomAttr();
|
||||
|
||||
sLog.outString("Loading enchant custom attributes...");
|
||||
spellmgr.LoadEnchantCustomAttr();
|
||||
sSpellMgr.LoadEnchantCustomAttr();
|
||||
|
||||
sLog.outString("Loading linked spells...");
|
||||
spellmgr.LoadSpellLinked();
|
||||
sSpellMgr.LoadSpellLinked();
|
||||
|
||||
sLog.outString("Loading Player Create Data...");
|
||||
objmgr.LoadPlayerInfo();
|
||||
sObjectMgr.LoadPlayerInfo();
|
||||
|
||||
sLog.outString("Loading Exploration BaseXP Data...");
|
||||
objmgr.LoadExplorationBaseXP();
|
||||
sObjectMgr.LoadExplorationBaseXP();
|
||||
|
||||
sLog.outString("Loading Pet Name Parts...");
|
||||
objmgr.LoadPetNames();
|
||||
sObjectMgr.LoadPetNames();
|
||||
|
||||
CharacterDatabaseCleaner::CleanDatabase();
|
||||
|
||||
sLog.outString("Loading the max pet number...");
|
||||
objmgr.LoadPetNumber();
|
||||
sObjectMgr.LoadPetNumber();
|
||||
|
||||
sLog.outString("Loading pet level stats...");
|
||||
objmgr.LoadPetLevelInfo();
|
||||
sObjectMgr.LoadPetLevelInfo();
|
||||
|
||||
sLog.outString("Loading Player Corpses...");
|
||||
objmgr.LoadCorpses();
|
||||
sObjectMgr.LoadCorpses();
|
||||
|
||||
sLog.outString("Loading Player level dependent mail rewards...");
|
||||
objmgr.LoadMailLevelRewards();
|
||||
sObjectMgr.LoadMailLevelRewards();
|
||||
|
||||
// Loot tables
|
||||
LoadLootTables();
|
||||
@@ -1496,64 +1496,64 @@ void World::SetInitialWorldSettings()
|
||||
LoadSkillExtraItemTable();
|
||||
|
||||
sLog.outString("Loading Skill Fishing base level requirements...");
|
||||
objmgr.LoadFishingBaseSkillLevel();
|
||||
sObjectMgr.LoadFishingBaseSkillLevel();
|
||||
|
||||
sLog.outString("Loading Achievements...");
|
||||
achievementmgr.LoadAchievementReferenceList();
|
||||
sAchievementMgr.LoadAchievementReferenceList();
|
||||
sLog.outString("Loading Achievement Criteria Lists...");
|
||||
achievementmgr.LoadAchievementCriteriaList();
|
||||
sAchievementMgr.LoadAchievementCriteriaList();
|
||||
sLog.outString("Loading Achievement Criteria Data...");
|
||||
achievementmgr.LoadAchievementCriteriaData();
|
||||
sAchievementMgr.LoadAchievementCriteriaData();
|
||||
sLog.outString("Loading Achievement Rewards...");
|
||||
achievementmgr.LoadRewards();
|
||||
sAchievementMgr.LoadRewards();
|
||||
sLog.outString("Loading Achievement Reward Locales...");
|
||||
achievementmgr.LoadRewardLocales();
|
||||
sAchievementMgr.LoadRewardLocales();
|
||||
sLog.outString("Loading Completed Achievements...");
|
||||
achievementmgr.LoadCompletedAchievements();
|
||||
sAchievementMgr.LoadCompletedAchievements();
|
||||
|
||||
///- Load dynamic data tables from the database
|
||||
sLog.outString("Loading Item Auctions...");
|
||||
auctionmgr.LoadAuctionItems();
|
||||
sAuctionMgr.LoadAuctionItems();
|
||||
sLog.outString("Loading Auctions...");
|
||||
auctionmgr.LoadAuctions();
|
||||
sAuctionMgr.LoadAuctions();
|
||||
|
||||
sLog.outString("Loading Guilds...");
|
||||
objmgr.LoadGuilds();
|
||||
sObjectMgr.LoadGuilds();
|
||||
|
||||
sLog.outString("Loading ArenaTeams...");
|
||||
objmgr.LoadArenaTeams();
|
||||
sObjectMgr.LoadArenaTeams();
|
||||
|
||||
sLog.outString("Loading Groups...");
|
||||
objmgr.LoadGroups();
|
||||
sObjectMgr.LoadGroups();
|
||||
|
||||
sLog.outString("Loading ReservedNames...");
|
||||
objmgr.LoadReservedPlayersNames();
|
||||
sObjectMgr.LoadReservedPlayersNames();
|
||||
|
||||
sLog.outString("Loading GameObjects for quests...");
|
||||
objmgr.LoadGameObjectForQuests();
|
||||
sObjectMgr.LoadGameObjectForQuests();
|
||||
|
||||
sLog.outString("Loading BattleMasters...");
|
||||
sBattlegroundMgr.LoadBattleMastersEntry();
|
||||
|
||||
sLog.outString("Loading GameTeleports...");
|
||||
objmgr.LoadGameTele();
|
||||
sObjectMgr.LoadGameTele();
|
||||
|
||||
sLog.outString("Loading Npc Text Id...");
|
||||
objmgr.LoadNpcTextId(); // must be after load Creature and NpcText
|
||||
sObjectMgr.LoadNpcTextId(); // must be after load Creature and NpcText
|
||||
|
||||
objmgr.LoadGossipScripts(); // must be before gossip menu options
|
||||
sObjectMgr.LoadGossipScripts(); // must be before gossip menu options
|
||||
|
||||
sLog.outString("Loading Gossip menu...");
|
||||
objmgr.LoadGossipMenu();
|
||||
sObjectMgr.LoadGossipMenu();
|
||||
|
||||
sLog.outString("Loading Gossip menu options...");
|
||||
objmgr.LoadGossipMenuItems();
|
||||
sObjectMgr.LoadGossipMenuItems();
|
||||
|
||||
sLog.outString("Loading Vendors...");
|
||||
objmgr.LoadVendors(); // must be after load CreatureTemplate and ItemTemplate
|
||||
sObjectMgr.LoadVendors(); // must be after load CreatureTemplate and ItemTemplate
|
||||
|
||||
sLog.outString("Loading Trainers...");
|
||||
objmgr.LoadTrainerSpell(); // must be after load CreatureTemplate
|
||||
sObjectMgr.LoadTrainerSpell(); // must be after load CreatureTemplate
|
||||
|
||||
sLog.outString("Loading Waypoints...");
|
||||
sWaypointMgr->Load();
|
||||
@@ -1565,14 +1565,14 @@ void World::SetInitialWorldSettings()
|
||||
sConditionMgr.LoadConditions();
|
||||
|
||||
sLog.outString("Loading GM tickets...");
|
||||
objmgr.LoadGMTickets();
|
||||
sObjectMgr.LoadGMTickets();
|
||||
|
||||
sLog.outString("Loading client addons...");
|
||||
sAddonMgr.LoadFromDB();
|
||||
|
||||
///- Handle outdated emails (delete/return)
|
||||
sLog.outString("Returning old mails...");
|
||||
objmgr.ReturnOrDeleteOldMails(false);
|
||||
sObjectMgr.ReturnOrDeleteOldMails(false);
|
||||
|
||||
sLog.outString("Loading Autobroadcasts...");
|
||||
LoadAutobroadcasts();
|
||||
@@ -1580,35 +1580,35 @@ void World::SetInitialWorldSettings()
|
||||
///- Load and initialize scripts
|
||||
sLog.outString("Loading Scripts...");
|
||||
sLog.outString();
|
||||
objmgr.LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
|
||||
objmgr.LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
|
||||
objmgr.LoadSpellScripts(); // must be after load Creature/Gameobject(Template/Data)
|
||||
objmgr.LoadGameObjectScripts(); // must be after load Creature/Gameobject(Template/Data)
|
||||
objmgr.LoadEventScripts(); // must be after load Creature/Gameobject(Template/Data)
|
||||
objmgr.LoadWaypointScripts();
|
||||
sObjectMgr.LoadQuestStartScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
|
||||
sObjectMgr.LoadQuestEndScripts(); // must be after load Creature/Gameobject(Template/Data) and QuestTemplate
|
||||
sObjectMgr.LoadSpellScripts(); // must be after load Creature/Gameobject(Template/Data)
|
||||
sObjectMgr.LoadGameObjectScripts(); // must be after load Creature/Gameobject(Template/Data)
|
||||
sObjectMgr.LoadEventScripts(); // must be after load Creature/Gameobject(Template/Data)
|
||||
sObjectMgr.LoadWaypointScripts();
|
||||
sLog.outString(">>> Scripts loaded");
|
||||
sLog.outString();
|
||||
|
||||
sLog.outString("Loading Scripts text locales..."); // must be after Load*Scripts calls
|
||||
objmgr.LoadDbScriptStrings();
|
||||
sObjectMgr.LoadDbScriptStrings();
|
||||
|
||||
sLog.outString("Loading CreatureEventAI Texts...");
|
||||
CreatureEAI_Mgr.LoadCreatureEventAI_Texts();
|
||||
sEventAIMgr.LoadCreatureEventAI_Texts();
|
||||
|
||||
sLog.outString("Loading CreatureEventAI Summons...");
|
||||
CreatureEAI_Mgr.LoadCreatureEventAI_Summons();
|
||||
sEventAIMgr.LoadCreatureEventAI_Summons();
|
||||
|
||||
sLog.outString("Loading CreatureEventAI Scripts...");
|
||||
CreatureEAI_Mgr.LoadCreatureEventAI_Scripts();
|
||||
sEventAIMgr.LoadCreatureEventAI_Scripts();
|
||||
|
||||
sLog.outString("Loading spell script names...");
|
||||
objmgr.LoadSpellScriptNames();
|
||||
sObjectMgr.LoadSpellScriptNames();
|
||||
|
||||
sLog.outString("Initializing Scripts...");
|
||||
sScriptMgr.Initialize();
|
||||
|
||||
sLog.outString("Validating spell scripts...");
|
||||
objmgr.ValidateSpellScripts();
|
||||
sObjectMgr.ValidateSpellScripts();
|
||||
|
||||
///- Initialize game time and timers
|
||||
sLog.outDebug("DEBUG:: Initialize game time and timers");
|
||||
@@ -1658,14 +1658,14 @@ void World::SetInitialWorldSettings()
|
||||
sMapMgr.Initialize();
|
||||
|
||||
sLog.outString("Starting Game Event system...");
|
||||
uint32 nextGameEvent = gameeventmgr.Initialize();
|
||||
uint32 nextGameEvent = sGameEventMgr.Initialize();
|
||||
m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent); //depend on next event
|
||||
|
||||
// Delete all characters which have been deleted X days before
|
||||
Player::DeleteOldCharacters();
|
||||
|
||||
sLog.outString("Starting Arena Season...");
|
||||
gameeventmgr.StartArenaSeason();
|
||||
sGameEventMgr.StartArenaSeason();
|
||||
|
||||
sLog.outString("Loading World States..."); // must be loaded before battleground and outdoor PvP
|
||||
LoadWorldStates();
|
||||
@@ -1702,7 +1702,7 @@ void World::SetInitialWorldSettings()
|
||||
InitRandomBGResetTime();
|
||||
|
||||
sLog.outString("Starting objects Pooling system...");
|
||||
poolhandler.Initialize();
|
||||
sPoolMgr.Initialize();
|
||||
|
||||
// possibly enable db logging; avoid massive startup spam by doing it here.
|
||||
if (sLog.GetLogDBLater())
|
||||
@@ -1877,11 +1877,11 @@ void World::Update(uint32 diff)
|
||||
if (++mail_timer > mail_timer_expires)
|
||||
{
|
||||
mail_timer = 0;
|
||||
objmgr.ReturnOrDeleteOldMails(true);
|
||||
sObjectMgr.ReturnOrDeleteOldMails(true);
|
||||
}
|
||||
|
||||
///- Handle expired auctions
|
||||
auctionmgr.Update();
|
||||
sAuctionMgr.Update();
|
||||
}
|
||||
|
||||
/// <li> Handle session updates when the timer has passed
|
||||
@@ -1967,13 +1967,13 @@ void World::Update(uint32 diff)
|
||||
if (m_timers[WUPDATE_EVENTS].Passed())
|
||||
{
|
||||
m_timers[WUPDATE_EVENTS].Reset(); // to give time for Update() to be processed
|
||||
uint32 nextGameEvent = gameeventmgr.Update();
|
||||
uint32 nextGameEvent = sGameEventMgr.Update();
|
||||
m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);
|
||||
m_timers[WUPDATE_EVENTS].Reset();
|
||||
}
|
||||
|
||||
// update the instance reset times
|
||||
sInstanceSaveManager.Update();
|
||||
sInstanceSaveMgr.Update();
|
||||
|
||||
// And last, but not least handle the issued cli commands
|
||||
ProcessCliCommands();
|
||||
@@ -1984,7 +1984,7 @@ void World::Update(uint32 diff)
|
||||
void World::ForceGameEventUpdate()
|
||||
{
|
||||
m_timers[WUPDATE_EVENTS].Reset(); // to give time for Update() to be processed
|
||||
uint32 nextGameEvent = gameeventmgr.Update();
|
||||
uint32 nextGameEvent = sGameEventMgr.Update();
|
||||
m_timers[WUPDATE_EVENTS].SetInterval(nextGameEvent);
|
||||
m_timers[WUPDATE_EVENTS].Reset();
|
||||
}
|
||||
@@ -2033,7 +2033,7 @@ namespace Trinity
|
||||
explicit WorldWorldTextBuilder(int32 textId, va_list* args = NULL) : i_textId(textId), i_args(args) {}
|
||||
void operator()(WorldPacketList& data_list, int32 loc_idx)
|
||||
{
|
||||
char const* text = objmgr.GetTrinityString(i_textId,loc_idx);
|
||||
char const* text = sObjectMgr.GetTrinityString(i_textId,loc_idx);
|
||||
|
||||
if (i_args)
|
||||
{
|
||||
@@ -2258,9 +2258,9 @@ bool World::RemoveBanAccount(BanMode mode, std::string nameOrIP)
|
||||
{
|
||||
uint32 account = 0;
|
||||
if (mode == BAN_ACCOUNT)
|
||||
account = accmgr.GetId (nameOrIP);
|
||||
account = sAccountMgr.GetId (nameOrIP);
|
||||
else if (mode == BAN_CHARACTER)
|
||||
account = objmgr.GetPlayerAccountIdByPlayerName (nameOrIP);
|
||||
account = sObjectMgr.GetPlayerAccountIdByPlayerName (nameOrIP);
|
||||
|
||||
if (!account)
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user