mirror of
https://github.com/mangosfour/server.git
synced 2025-12-14 16:37:01 +00:00
[8789] Rename several singleton macros to use more consistent names.
* objmgr -> sObjectMgr * spellmgr -> sSpellMgr * WaypointMgr -> sWaypointMgr * poolhandler -> sPoolMgr * objaccessor -> sObjectAccessor * mapmgr -> sMapMgr * sInstanceSaveManager -> sInstanceSaveMgr * ticketmgr -> sTicketMgr * CreatureEAI_Mgr -> sEventAIMgr * auctionmgr -> sAuctionMgr * achievementmgr -> sAchievementMgr
This commit is contained in:
XTZGZoReX
parent
539072fcbd
commit
0734adb746
84 changed files with 1113 additions and 1113 deletions
|
|
@ -377,7 +377,7 @@ void World::RemoveWeather(uint32 id)
|
|||
/// Add a Weather object to the list
|
||||
Weather* World::AddWeather(uint32 zone_id)
|
||||
{
|
||||
WeatherZoneChances const* weatherChances = objmgr.GetWeatherChances(zone_id);
|
||||
WeatherZoneChances const* weatherChances = sObjectMgr.GetWeatherChances(zone_id);
|
||||
|
||||
// zone not have weather, ignore
|
||||
if(!weatherChances)
|
||||
|
|
@ -569,7 +569,7 @@ void World::LoadConfigSettings(bool reload)
|
|||
m_configs[CONFIG_INTERVAL_GRIDCLEAN] = MIN_GRID_DELAY;
|
||||
}
|
||||
if(reload)
|
||||
mapmgr.SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
|
||||
sMapMgr.SetGridCleanUpDelay(m_configs[CONFIG_INTERVAL_GRIDCLEAN]);
|
||||
|
||||
m_configs[CONFIG_INTERVAL_MAPUPDATE] = sConfig.GetIntDefault("MapUpdateInterval", 100);
|
||||
if(m_configs[CONFIG_INTERVAL_MAPUPDATE] < MIN_MAP_UPDATE_DELAY)
|
||||
|
|
@ -578,7 +578,7 @@ void World::LoadConfigSettings(bool reload)
|
|||
m_configs[CONFIG_INTERVAL_MAPUPDATE] = MIN_MAP_UPDATE_DELAY;
|
||||
}
|
||||
if(reload)
|
||||
mapmgr.SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
|
||||
sMapMgr.SetMapUpdateInterval(m_configs[CONFIG_INTERVAL_MAPUPDATE]);
|
||||
|
||||
m_configs[CONFIG_INTERVAL_CHANGEWEATHER] = sConfig.GetIntDefault("ChangeWeatherInterval", 10 * MINUTE * IN_MILISECONDS);
|
||||
|
||||
|
|
@ -1113,7 +1113,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)
|
||||
|
|
@ -1133,7 +1133,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 MaNGOS strings...");
|
||||
if (!objmgr.LoadMangosStrings())
|
||||
if (!sObjectMgr.LoadMangosStrings())
|
||||
exit(1); // Error message displayed in function already
|
||||
|
||||
///- Update the realm entry in the database with the realm type from the config file
|
||||
|
|
@ -1153,124 +1153,124 @@ void World::SetInitialWorldSettings()
|
|||
DetectDBCLang();
|
||||
|
||||
sLog.outString( "Loading Script Names...");
|
||||
objmgr.LoadScriptNames();
|
||||
sObjectMgr.LoadScriptNames();
|
||||
|
||||
sLog.outString( "Loading InstanceTemplate..." );
|
||||
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();
|
||||
sLog.outString( "Loading Localization strings..." );
|
||||
objmgr.LoadCreatureLocales();
|
||||
objmgr.LoadGameObjectLocales();
|
||||
objmgr.LoadItemLocales();
|
||||
objmgr.LoadQuestLocales();
|
||||
objmgr.LoadNpcTextLocales();
|
||||
objmgr.LoadPageTextLocales();
|
||||
objmgr.LoadNpcOptionLocales();
|
||||
objmgr.LoadPointOfInterestLocales();
|
||||
objmgr.SetDBCLocaleIndex(GetDefaultDbcLocale()); // Get once for all the locale index of DBC language (console/broadcasts)
|
||||
sObjectMgr.LoadCreatureLocales();
|
||||
sObjectMgr.LoadGameObjectLocales();
|
||||
sObjectMgr.LoadItemLocales();
|
||||
sObjectMgr.LoadQuestLocales();
|
||||
sObjectMgr.LoadNpcTextLocales();
|
||||
sObjectMgr.LoadPageTextLocales();
|
||||
sObjectMgr.LoadNpcOptionLocales();
|
||||
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 Chain Data..." );
|
||||
spellmgr.LoadSpellChains();
|
||||
sSpellMgr.LoadSpellChains();
|
||||
|
||||
sLog.outString( "Loading Spell Elixir types..." );
|
||||
spellmgr.LoadSpellElixirs();
|
||||
sSpellMgr.LoadSpellElixirs();
|
||||
|
||||
sLog.outString( "Loading Spell Learn Skills..." );
|
||||
spellmgr.LoadSpellLearnSkills(); // must be after LoadSpellChains
|
||||
sSpellMgr.LoadSpellLearnSkills(); // must be after LoadSpellChains
|
||||
|
||||
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 Spell Proc Item Enchant..." );
|
||||
spellmgr.LoadSpellProcItemEnchant(); // must be after LoadSpellChains
|
||||
sSpellMgr.LoadSpellProcItemEnchant(); // must be after LoadSpellChains
|
||||
|
||||
sLog.outString( "Loading Aggro Spells Definitions...");
|
||||
spellmgr.LoadSpellThreats();
|
||||
sSpellMgr.LoadSpellThreats();
|
||||
|
||||
sLog.outString( "Loading NPC Texts..." );
|
||||
objmgr.LoadGossipText();
|
||||
sObjectMgr.LoadGossipText();
|
||||
|
||||
sLog.outString( "Loading Item Random Enchantments Table..." );
|
||||
LoadRandomEnchantmentsTable();
|
||||
|
||||
sLog.outString( "Loading Items..." ); // must be after LoadRandomEnchantmentsTable and LoadPageTexts
|
||||
objmgr.LoadItemPrototypes();
|
||||
sObjectMgr.LoadItemPrototypes();
|
||||
|
||||
sLog.outString( "Loading Item Texts..." );
|
||||
objmgr.LoadItemTexts();
|
||||
sObjectMgr.LoadItemTexts();
|
||||
|
||||
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 SpellsScriptTarget...");
|
||||
spellmgr.LoadSpellScriptTarget(); // must be after LoadCreatureTemplates and LoadGameobjectInfo
|
||||
sSpellMgr.LoadSpellScriptTarget(); // must be after LoadCreatureTemplates and LoadGameobjectInfo
|
||||
|
||||
sLog.outString( "Loading ItemRequiredTarget...");
|
||||
objmgr.LoadItemRequiredTarget();
|
||||
sObjectMgr.LoadItemRequiredTarget();
|
||||
|
||||
sLog.outString( "Loading Creature Reputation OnKill Data..." );
|
||||
objmgr.LoadReputationOnKill();
|
||||
sObjectMgr.LoadReputationOnKill();
|
||||
|
||||
sLog.outString( "Loading Points Of Interest Data..." );
|
||||
objmgr.LoadPointsOfInterest();
|
||||
sObjectMgr.LoadPointsOfInterest();
|
||||
|
||||
sLog.outString( "Loading Creature Data..." );
|
||||
objmgr.LoadCreatures();
|
||||
sObjectMgr.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 Addon Data..." );
|
||||
sLog.outString();
|
||||
objmgr.LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures()
|
||||
sObjectMgr.LoadCreatureAddons(); // must be after LoadCreatureTemplates() and LoadCreatures()
|
||||
sLog.outString( ">>> Creature Addon Data loaded" );
|
||||
sLog.outString();
|
||||
|
||||
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...");
|
||||
sLog.outString();
|
||||
|
|
@ -1279,67 +1279,67 @@ void World::SetInitialWorldSettings()
|
|||
sLog.outString();
|
||||
|
||||
sLog.outString( "Loading Weather Data..." );
|
||||
objmgr.LoadWeatherZoneChances();
|
||||
sObjectMgr.LoadWeatherZoneChances();
|
||||
|
||||
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( "Loading Quests Relations..." );
|
||||
sLog.outString();
|
||||
objmgr.LoadQuestRelations(); // must be after quest load
|
||||
sObjectMgr.LoadQuestRelations(); // must be after quest load
|
||||
sLog.outString( ">>> Quests Relations loaded" );
|
||||
sLog.outString();
|
||||
|
||||
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(); // must be after item template load
|
||||
sObjectMgr.LoadAreaTriggerTeleports(); // 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 Player Create Info & Level Stats..." );
|
||||
sLog.outString();
|
||||
objmgr.LoadPlayerInfo();
|
||||
sObjectMgr.LoadPlayerInfo();
|
||||
sLog.outString( ">>> Player Create Info & Level Stats loaded" );
|
||||
sLog.outString();
|
||||
|
||||
sLog.outString( "Loading Exploration BaseXP Data..." );
|
||||
objmgr.LoadExplorationBaseXP();
|
||||
sObjectMgr.LoadExplorationBaseXP();
|
||||
|
||||
sLog.outString( "Loading Pet Name Parts..." );
|
||||
objmgr.LoadPetNames();
|
||||
sObjectMgr.LoadPetNames();
|
||||
|
||||
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();
|
||||
|
||||
sLog.outString( "Loading Loot Tables..." );
|
||||
sLog.outString();
|
||||
|
|
@ -1354,41 +1354,41 @@ void World::SetInitialWorldSettings()
|
|||
LoadSkillExtraItemTable();
|
||||
|
||||
sLog.outString( "Loading Skill Fishing base level requirements..." );
|
||||
objmgr.LoadFishingBaseSkillLevel();
|
||||
sObjectMgr.LoadFishingBaseSkillLevel();
|
||||
|
||||
sLog.outString( "Loading Achievements..." );
|
||||
sLog.outString();
|
||||
achievementmgr.LoadAchievementReferenceList();
|
||||
achievementmgr.LoadAchievementCriteriaList();
|
||||
achievementmgr.LoadAchievementCriteriaRequirements();
|
||||
achievementmgr.LoadRewards();
|
||||
achievementmgr.LoadRewardLocales();
|
||||
achievementmgr.LoadCompletedAchievements();
|
||||
sAchievementMgr.LoadAchievementReferenceList();
|
||||
sAchievementMgr.LoadAchievementCriteriaList();
|
||||
sAchievementMgr.LoadAchievementCriteriaRequirements();
|
||||
sAchievementMgr.LoadRewards();
|
||||
sAchievementMgr.LoadRewardLocales();
|
||||
sAchievementMgr.LoadCompletedAchievements();
|
||||
sLog.outString( ">>> Achievements loaded" );
|
||||
sLog.outString();
|
||||
|
||||
///- Load dynamic data tables from the database
|
||||
sLog.outString( "Loading Auctions..." );
|
||||
sLog.outString();
|
||||
auctionmgr.LoadAuctionItems();
|
||||
auctionmgr.LoadAuctions();
|
||||
sAuctionMgr.LoadAuctionItems();
|
||||
sAuctionMgr.LoadAuctions();
|
||||
sLog.outString( ">>> Auctions loaded" );
|
||||
sLog.outString();
|
||||
|
||||
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();
|
||||
|
|
@ -1397,53 +1397,53 @@ void World::SetInitialWorldSettings()
|
|||
sBattleGroundMgr.LoadBattleEventIndexes();
|
||||
|
||||
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
|
||||
|
||||
sLog.outString( "Loading Npc Options..." );
|
||||
objmgr.LoadNpcOptions();
|
||||
sObjectMgr.LoadNpcOptions();
|
||||
|
||||
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..." );
|
||||
sLog.outString();
|
||||
WaypointMgr.Load();
|
||||
sWaypointMgr.Load();
|
||||
|
||||
sLog.outString( "Loading GM tickets...");
|
||||
ticketmgr.LoadGMTickets();
|
||||
sTicketMgr.LoadGMTickets();
|
||||
|
||||
///- Handle outdated emails (delete/return)
|
||||
sLog.outString( "Returning old mails..." );
|
||||
objmgr.ReturnOrDeleteOldMails(false);
|
||||
sObjectMgr.ReturnOrDeleteOldMails(false);
|
||||
|
||||
///- 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)
|
||||
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)
|
||||
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(false); // false, will checked in LoadCreatureEventAI_Scripts
|
||||
sEventAIMgr.LoadCreatureEventAI_Texts(false); // false, will checked in LoadCreatureEventAI_Scripts
|
||||
|
||||
sLog.outString( "Loading CreatureEventAI Summons...");
|
||||
CreatureEAI_Mgr.LoadCreatureEventAI_Summons(false); // false, will checked in LoadCreatureEventAI_Scripts
|
||||
sEventAIMgr.LoadCreatureEventAI_Summons(false); // false, will checked in LoadCreatureEventAI_Scripts
|
||||
|
||||
sLog.outString( "Loading CreatureEventAI Scripts...");
|
||||
CreatureEAI_Mgr.LoadCreatureEventAI_Scripts();
|
||||
sEventAIMgr.LoadCreatureEventAI_Scripts();
|
||||
|
||||
sLog.outString( "Initializing Scripts..." );
|
||||
if(!LoadScriptingModule())
|
||||
|
|
@ -1489,7 +1489,7 @@ void World::SetInitialWorldSettings()
|
|||
|
||||
///- Initialize MapManager
|
||||
sLog.outString( "Starting Map System" );
|
||||
mapmgr.Initialize();
|
||||
sMapMgr.Initialize();
|
||||
|
||||
///- Initialize Battlegrounds
|
||||
sLog.outString( "Starting BattleGround System" );
|
||||
|
|
@ -1498,7 +1498,7 @@ void World::SetInitialWorldSettings()
|
|||
|
||||
//Not sure if this can be moved up in the sequence (with static data loading) as it uses MapManager
|
||||
sLog.outString( "Loading Transports..." );
|
||||
mapmgr.LoadTransports();
|
||||
sMapMgr.LoadTransports();
|
||||
|
||||
sLog.outString("Deleting expired bans..." );
|
||||
loginDatabase.Execute("DELETE FROM ip_banned WHERE unbandate<=UNIX_TIMESTAMP() AND unbandate<>bandate");
|
||||
|
|
@ -1507,7 +1507,7 @@ void World::SetInitialWorldSettings()
|
|||
InitDailyQuestResetTime();
|
||||
|
||||
sLog.outString("Starting objects Pooling system..." );
|
||||
poolhandler.Initialize();
|
||||
sPoolMgr.Initialize();
|
||||
|
||||
sLog.outString("Starting Game Event system..." );
|
||||
uint32 nextGameEvent = gameeventmgr.Initialize();
|
||||
|
|
@ -1592,11 +1592,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
|
||||
|
|
@ -1643,7 +1643,7 @@ void World::Update(uint32 diff)
|
|||
{
|
||||
m_timers[WUPDATE_OBJECTS].Reset();
|
||||
///- Update objects when the timer has passed (maps, transport, creatures,...)
|
||||
mapmgr.Update(diff); // As interval = 0
|
||||
sMapMgr.Update(diff); // As interval = 0
|
||||
|
||||
sBattleGroundMgr.Update(diff);
|
||||
}
|
||||
|
|
@ -1670,10 +1670,10 @@ void World::Update(uint32 diff)
|
|||
|
||||
/// </ul>
|
||||
///- Move all creatures with "delayed move" and remove and delete all objects with "delayed remove"
|
||||
mapmgr.DoDelayedMovesAndRemoves();
|
||||
sMapMgr.DoDelayedMovesAndRemoves();
|
||||
|
||||
// update the instance reset times
|
||||
sInstanceSaveManager.Update();
|
||||
sInstanceSaveMgr.Update();
|
||||
|
||||
// And last, but not least handle the issued cli commands
|
||||
ProcessCliCommands();
|
||||
|
|
@ -1705,7 +1705,7 @@ namespace MaNGOS
|
|||
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.GetMangosString(i_textId,loc_idx);
|
||||
char const* text = sObjectMgr.GetMangosString(i_textId,loc_idx);
|
||||
|
||||
if(i_args)
|
||||
{
|
||||
|
|
@ -1911,7 +1911,7 @@ bool World::RemoveBanAccount(BanMode mode, std::string nameOrIP)
|
|||
if (mode == BAN_ACCOUNT)
|
||||
account = accmgr.GetId (nameOrIP);
|
||||
else if (mode == BAN_CHARACTER)
|
||||
account = objmgr.GetPlayerAccountIdByPlayerName (nameOrIP);
|
||||
account = sObjectMgr.GetPlayerAccountIdByPlayerName (nameOrIP);
|
||||
|
||||
if (!account)
|
||||
return false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue