From 928443d8993869dfbf3adceabe4ba0b3cfe0edef Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 23 Dec 2010 23:25:44 +0100 Subject: Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming) --HG-- branch : trunk --- src/server/scripts/Commands/cs_account.cpp | 4 +- src/server/scripts/Commands/cs_debug.cpp | 18 +-- src/server/scripts/Commands/cs_gm.cpp | 4 +- src/server/scripts/Commands/cs_go.cpp | 8 +- src/server/scripts/Commands/cs_gobject.cpp | 6 +- src/server/scripts/Commands/cs_modify.cpp | 6 +- src/server/scripts/Commands/cs_npc.cpp | 16 +-- src/server/scripts/Commands/cs_reload.cpp | 206 ++++++++++++++--------------- src/server/scripts/Commands/cs_wp.cpp | 34 ++--- 9 files changed, 151 insertions(+), 151 deletions(-) (limited to 'src/server/scripts/Commands') diff --git a/src/server/scripts/Commands/cs_account.cpp b/src/server/scripts/Commands/cs_account.cpp index 122d034e86e..883a8b76ede 100644 --- a/src/server/scripts/Commands/cs_account.cpp +++ b/src/server/scripts/Commands/cs_account.cpp @@ -74,7 +74,7 @@ public: uint32 account_id = handler->GetSession()->GetAccountId(); int expansion = atoi(szExp); //get int anyway (0 if error) - if (expansion < 0 || uint8(expansion) > sWorld.getIntConfig(CONFIG_EXPANSION)) + if (expansion < 0 || uint8(expansion) > sWorld->getIntConfig(CONFIG_EXPANSION)) { handler->SendSysMessage(LANG_IMPROPER_VALUE); handler->SetSentErrorMessage(true); @@ -377,7 +377,7 @@ public: return false; int expansion = atoi(szExp); //get int anyway (0 if error) - if (expansion < 0 || uint8(expansion) > sWorld.getIntConfig(CONFIG_EXPANSION)) + if (expansion < 0 || uint8(expansion) > sWorld->getIntConfig(CONFIG_EXPANSION)) return false; // No SQL injection diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp index bb3374234f3..f61e79539ab 100644 --- a/src/server/scripts/Commands/cs_debug.cpp +++ b/src/server/scripts/Commands/cs_debug.cpp @@ -239,7 +239,7 @@ public: uint32 icon = atol(icon_text); uint32 flags = atol(flags_text); - sLog.outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags); + sLog->outDetail("Command : POI, NPC = %u, icon = %u flags = %u", target->GetGUIDLow(), icon,flags); pPlayer->PlayerTalkClass->SendPointOfInterest(target->GetPositionX(), target->GetPositionY(), Poi_Icon(icon), flags, 30, "Test POI"); return true; } @@ -391,12 +391,12 @@ public: } else { - sLog.outDebug("Sending opcode: unknown type '%s'", type.c_str()); + sLog->outDebug("Sending opcode: unknown type '%s'", type.c_str()); break; } } ifs.close(); - sLog.outDebug("Sending opcode %u", data.GetOpcode()); + sLog->outDebug("Sending opcode %u", data.GetOpcode()); data.hexlike(); player->GetSession()->SendPacket(&data); handler->PSendSysMessage(LANG_COMMAND_OPCODESENT, data.GetOpcode(), unit->GetName()); @@ -1053,14 +1053,14 @@ public: if (isint32) { iValue = (uint32)atoi(py); - sLog.outDebug(handler->GetTrinityString(LANG_SET_UINT), GUID_LOPART(guid), Opcode, iValue); + sLog->outDebug(handler->GetTrinityString(LANG_SET_UINT), GUID_LOPART(guid), Opcode, iValue); target->SetUInt32Value(Opcode , iValue); handler->PSendSysMessage(LANG_SET_UINT_FIELD, GUID_LOPART(guid), Opcode,iValue); } else { fValue = (float)atof(py); - sLog.outDebug(handler->GetTrinityString(LANG_SET_FLOAT), GUID_LOPART(guid), Opcode, fValue); + sLog->outDebug(handler->GetTrinityString(LANG_SET_FLOAT), GUID_LOPART(guid), Opcode, fValue); target->SetFloatValue(Opcode , fValue); handler->PSendSysMessage(LANG_SET_FLOAT_FIELD, GUID_LOPART(guid), Opcode,fValue); } @@ -1104,13 +1104,13 @@ public: if (isint32) { iValue = target->GetUInt32Value(Opcode); - sLog.outDebug(handler->GetTrinityString(LANG_GET_UINT), GUID_LOPART(guid), Opcode, iValue); + sLog->outDebug(handler->GetTrinityString(LANG_GET_UINT), GUID_LOPART(guid), Opcode, iValue); handler->PSendSysMessage(LANG_GET_UINT_FIELD, GUID_LOPART(guid), Opcode, iValue); } else { fValue = target->GetFloatValue(Opcode); - sLog.outDebug(handler->GetTrinityString(LANG_GET_FLOAT), GUID_LOPART(guid), Opcode, fValue); + sLog->outDebug(handler->GetTrinityString(LANG_GET_FLOAT), GUID_LOPART(guid), Opcode, fValue); handler->PSendSysMessage(LANG_GET_FLOAT_FIELD, GUID_LOPART(guid), Opcode, fValue); } @@ -1137,7 +1137,7 @@ public: return false; } - sLog.outDebug(handler->GetTrinityString(LANG_CHANGE_32BIT), Opcode, Value); + sLog->outDebug(handler->GetTrinityString(LANG_CHANGE_32BIT), Opcode, Value); int CurrentValue = (int)handler->GetSession()->GetPlayer()->GetUInt32Value(Opcode); @@ -1223,7 +1223,7 @@ public: if (Value > 32) //uint32 = 32 bits return false; - sLog.outDebug(handler->GetTrinityString(LANG_SET_32BIT), Opcode, Value); + sLog->outDebug(handler->GetTrinityString(LANG_SET_32BIT), Opcode, Value); uint32 iValue = Value ? 1 << (Value - 1) : 0; target->SetUInt32Value(Opcode , iValue); diff --git a/src/server/scripts/Commands/cs_gm.cpp b/src/server/scripts/Commands/cs_gm.cpp index f6b699bdb5a..8e3c8158585 100644 --- a/src/server/scripts/Commands/cs_gm.cpp +++ b/src/server/scripts/Commands/cs_gm.cpp @@ -116,11 +116,11 @@ public: bool footer = false; ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, *HashMapHolder::GetLock(), true); - HashMapHolder::MapType &m = sObjectAccessor.GetPlayers(); + HashMapHolder::MapType &m = sObjectAccessor->GetPlayers(); for (HashMapHolder::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) { AccountTypes itr_sec = itr->second->GetSession()->GetSecurity(); - if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= AccountTypes(sWorld.getIntConfig(CONFIG_GM_LEVEL_IN_GM_LIST)))) && + if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= AccountTypes(sWorld->getIntConfig(CONFIG_GM_LEVEL_IN_GM_LIST)))) && (!handler->GetSession() || itr->second->IsVisibleGloballyFor(handler->GetSession()->GetPlayer()))) { if (first) diff --git a/src/server/scripts/Commands/cs_go.cpp b/src/server/scripts/Commands/cs_go.cpp index 0007ad62e40..4ef48cd1dd7 100644 --- a/src/server/scripts/Commands/cs_go.cpp +++ b/src/server/scripts/Commands/cs_go.cpp @@ -85,7 +85,7 @@ public: // User wants to teleport to the NPC's template entry if (strcmp(pParam1, "id") == 0) { - //sLog.outError("DEBUG: ID found"); + //sLog->outError("DEBUG: ID found"); // Get the "creature_template.entry" // number or [name] Shift-click form |color|Hcreature_entry:creature_id|h[name]|h|r @@ -97,7 +97,7 @@ public: return false; int32 tEntry = atoi(cId); - //sLog.outError("DEBUG: ID value: %d", tEntry); + //sLog->outError("DEBUG: ID value: %d", tEntry); if (!tEntry) return false; @@ -105,7 +105,7 @@ public: } else { - //sLog.outError("DEBUG: ID *not found*"); + //sLog->outError("DEBUG: ID *not found*"); int32 guid = atoi(pParam1); @@ -121,7 +121,7 @@ public: whereClause << "WHERE guid = '" << guid << "'"; } } - //sLog.outError("DEBUG: %s", whereClause.c_str()); + //sLog->outError("DEBUG: %s", whereClause.c_str()); QueryResult result = WorldDatabase.PQuery("SELECT position_x,position_y,position_z,orientation,map FROM creature %s", whereClause.str().c_str()); if (!result) diff --git a/src/server/scripts/Commands/cs_gobject.cpp b/src/server/scripts/Commands/cs_gobject.cpp index f36a876abdc..2f9e981ffbb 100644 --- a/src/server/scripts/Commands/cs_gobject.cpp +++ b/src/server/scripts/Commands/cs_gobject.cpp @@ -133,7 +133,7 @@ public: if (gInfo->displayId && !sGameObjectDisplayInfoStore.LookupEntry(gInfo->displayId)) { // report to DB errors log as in loading case - sLog.outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.",id, gInfo->type, gInfo->displayId); + sLog->outErrorDb("Gameobject (Entry %u GoType: %u) have invalid displayId (%u), not spawned.",id, gInfo->type, gInfo->displayId); handler->PSendSysMessage(LANG_GAMEOBJECT_HAVE_INVALID_DATA,id); handler->SetSentErrorMessage(true); return false; @@ -159,7 +159,7 @@ public: { uint32 value = atoi((char*)spawntimeSecs); pGameObj->SetRespawnTime(value); - //sLog.outDebug("*** spawntimeSecs: %d", value); + //sLog->outDebug("*** spawntimeSecs: %d", value); } // fill the gameobject data and save to the db @@ -172,7 +172,7 @@ public: return false; } - sLog.outDebug(handler->GetTrinityString(LANG_GAMEOBJECT_CURRENT), gInfo->name, db_lowGUID, x, y, z, o); + sLog->outDebug(handler->GetTrinityString(LANG_GAMEOBJECT_CURRENT), gInfo->name, db_lowGUID, x, y, z, o); map->Add(pGameObj); diff --git a/src/server/scripts/Commands/cs_modify.cpp b/src/server/scripts/Commands/cs_modify.cpp index 99e8d06e204..6953ed967f4 100644 --- a/src/server/scripts/Commands/cs_modify.cpp +++ b/src/server/scripts/Commands/cs_modify.cpp @@ -191,7 +191,7 @@ public: target->SetMaxPower(POWER_ENERGY,energym); target->SetPower(POWER_ENERGY, energy); - sLog.outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY),target->GetMaxPower(POWER_ENERGY)); + sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_ENERGY),target->GetMaxPower(POWER_ENERGY)); return true; } @@ -998,7 +998,7 @@ public: { int32 newmoney = int32(moneyuser) + addmoney; - sLog.outDetail(handler->GetTrinityString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney); + sLog->outDetail(handler->GetTrinityString(LANG_CURRENT_MONEY), moneyuser, addmoney, newmoney); if (newmoney <= 0) { handler->PSendSysMessage(LANG_YOU_TAKE_ALL_MONEY, handler->GetNameLink(target).c_str()); @@ -1030,7 +1030,7 @@ public: target->ModifyMoney(addmoney); } - sLog.outDetail(handler->GetTrinityString(LANG_NEW_MONEY), moneyuser, addmoney, target->GetMoney()); + sLog->outDetail(handler->GetTrinityString(LANG_NEW_MONEY), moneyuser, addmoney, target->GetMoney()); return true; } diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 3a45f774672..3eda0b508c9 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -272,14 +272,14 @@ public: static bool HandleNpcSetAllowMovementCommand(ChatHandler* handler, const char* /*args*/) { - if (sWorld.getAllowMovement()) + if (sWorld->getAllowMovement()) { - sWorld.SetAllowMovement(false); + sWorld->SetAllowMovement(false); handler->SendSysMessage(LANG_CREATURE_MOVE_DISABLED); } else { - sWorld.SetAllowMovement(true); + sWorld->SetAllowMovement(true); handler->SendSysMessage(LANG_CREATURE_MOVE_ENABLED); } return true; @@ -316,7 +316,7 @@ public: return false; uint8 lvl = (uint8) atoi((char*)args); - if (lvl < 1 || lvl > sWorld.getIntConfig(CONFIG_MAX_PLAYER_LEVEL) + 3) + if (lvl < 1 || lvl > sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) + 3) { handler->SendSysMessage(LANG_BAD_VALUE); handler->SetSentErrorMessage(true); @@ -726,7 +726,7 @@ public: if (dontdel_str) { - //sLog.outError("DEBUG: All 3 params are set"); + //sLog->outError("DEBUG: All 3 params are set"); // All 3 params are set // GUID @@ -734,7 +734,7 @@ public: // doNotDEL if (stricmp(dontdel_str, "NODEL") == 0) { - //sLog.outError("DEBUG: doNotDelete = true;"); + //sLog->outError("DEBUG: doNotDelete = true;"); doNotDelete = true; } } @@ -743,10 +743,10 @@ public: // Only 2 params - but maybe NODEL is set if (type_str) { - sLog.outError("DEBUG: Only 2 params "); + sLog->outError("DEBUG: Only 2 params "); if (stricmp(type_str, "NODEL") == 0) { - //sLog.outError("DEBUG: type_str, NODEL "); + //sLog->outError("DEBUG: type_str, NODEL "); doNotDelete = true; type_str = NULL; } diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp index 676daa6a22f..d7c3a204f8a 100644 --- a/src/server/scripts/Commands/cs_reload.cpp +++ b/src/server/scripts/Commands/cs_reload.cpp @@ -214,7 +214,7 @@ public: static bool HandleReloadAllLootCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables..."); + sLog->outString("Re-Loading Loot Tables..."); LoadLootTables(); handler->SendGlobalGMSysMessage("DB tables `*_loot_template` reloaded."); sConditionMgr->LoadConditions(true); @@ -238,7 +238,7 @@ public: HandleReloadQuestPOICommand(handler,"a"); HandleReloadQuestTemplateCommand(handler,"a"); - sLog.outString("Re-Loading Quests Relations..."); + sLog->outString("Re-Loading Quests Relations..."); sObjectMgr->LoadQuestRelations(); handler->SendGlobalGMSysMessage("DB tables `*_questrelation` and `*_involvedrelation` reloaded."); return true; @@ -246,14 +246,14 @@ public: static bool HandleReloadAllScriptsCommand(ChatHandler* handler, const char* /*args*/) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->PSendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); return false; } - sLog.outString("Re-Loading Scripts..."); + sLog->outString("Re-Loading Scripts..."); HandleReloadGameObjectScriptsCommand(handler,"a"); HandleReloadGossipScriptsCommand(handler,"a"); HandleReloadEventScriptsCommand(handler,"a"); @@ -326,8 +326,8 @@ public: static bool HandleReloadConfigCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading config settings..."); - sWorld.LoadConfigSettings(true); + sLog->outString("Re-Loading config settings..."); + sWorld->LoadConfigSettings(true); sMapMgr->InitializeVisibilityDistanceInfo(); handler->SendGlobalGMSysMessage("World config settings reloaded."); return true; @@ -335,7 +335,7 @@ public: static bool HandleReloadAccessRequirementCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Access Requirement definitions..."); + sLog->outString("Re-Loading Access Requirement definitions..."); sObjectMgr->LoadAccessRequirements(); handler->SendGlobalGMSysMessage("DB table `access_requirement` reloaded."); return true; @@ -343,7 +343,7 @@ public: static bool HandleReloadAchievementCriteriaDataCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Additional Achievement Criteria Data..."); + sLog->outString("Re-Loading Additional Achievement Criteria Data..."); sAchievementMgr->LoadAchievementCriteriaData(); handler->SendGlobalGMSysMessage("DB table `achievement_criteria_data` reloaded."); return true; @@ -351,7 +351,7 @@ public: static bool HandleReloadAchievementRewardCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Achievement Reward Data..."); + sLog->outString("Re-Loading Achievement Reward Data..."); sAchievementMgr->LoadRewards(); handler->SendGlobalGMSysMessage("DB table `achievement_reward` reloaded."); return true; @@ -359,7 +359,7 @@ public: static bool HandleReloadAreaTriggerTavernCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Tavern Area Triggers..."); + sLog->outString("Re-Loading Tavern Area Triggers..."); sObjectMgr->LoadTavernAreaTriggers(); handler->SendGlobalGMSysMessage("DB table `areatrigger_tavern` reloaded."); return true; @@ -367,7 +367,7 @@ public: static bool HandleReloadAreaTriggerTeleportCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading AreaTrigger teleport definitions..."); + sLog->outString("Re-Loading AreaTrigger teleport definitions..."); sObjectMgr->LoadAreaTriggerTeleports(); handler->SendGlobalGMSysMessage("DB table `areatrigger_teleport` reloaded."); return true; @@ -375,8 +375,8 @@ public: static bool HandleReloadAutobroadcastCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Autobroadcast..."); - sWorld.LoadAutobroadcasts(); + sLog->outString("Re-Loading Autobroadcast..."); + sWorld->LoadAutobroadcasts(); handler->SendGlobalGMSysMessage("DB table `autobroadcast` reloaded."); return true; } @@ -390,7 +390,7 @@ public: static bool HandleReloadOnKillReputationCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading creature award reputation definitions..."); + sLog->outString("Re-Loading creature award reputation definitions..."); sObjectMgr->LoadReputationOnKill(); handler->SendGlobalGMSysMessage("DB table `creature_onkill_reputation` reloaded."); return true; @@ -418,7 +418,7 @@ public: return false; } - sLog.outString("Reloading creature template entry %u", entry); + sLog->outString("Reloading creature template entry %u", entry); Field *fields = result->Fetch(); @@ -539,7 +539,7 @@ public: static bool HandleReloadCreatureQuestRelationsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Loading Quests Relations... (`creature_questrelation`)"); + sLog->outString("Loading Quests Relations... (`creature_questrelation`)"); sObjectMgr->LoadCreatureQuestRelations(); handler->SendGlobalGMSysMessage("DB table `creature_questrelation` (creature quest givers) reloaded."); return true; @@ -547,7 +547,7 @@ public: static bool HandleReloadCreatureLinkedRespawnCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Loading Linked Respawns... (`creature_linked_respawn`)"); + sLog->outString("Loading Linked Respawns... (`creature_linked_respawn`)"); sObjectMgr->LoadCreatureLinkedRespawn(); handler->SendGlobalGMSysMessage("DB table `creature_linked_respawn` (creature linked respawns) reloaded."); return true; @@ -555,7 +555,7 @@ public: static bool HandleReloadCreatureQuestInvRelationsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Loading Quests Relations... (`creature_involvedrelation`)"); + sLog->outString("Loading Quests Relations... (`creature_involvedrelation`)"); sObjectMgr->LoadCreatureInvolvedRelations(); handler->SendGlobalGMSysMessage("DB table `creature_involvedrelation` (creature quest takers) reloaded."); return true; @@ -563,7 +563,7 @@ public: static bool HandleReloadGossipMenuCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `gossip_menu` Table!"); + sLog->outString("Re-Loading `gossip_menu` Table!"); sObjectMgr->LoadGossipMenu(); handler->SendGlobalGMSysMessage("DB table `gossip_menu` reloaded."); sConditionMgr->LoadConditions(true); @@ -572,7 +572,7 @@ public: static bool HandleReloadGossipMenuOptionCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `gossip_menu_option` Table!"); + sLog->outString("Re-Loading `gossip_menu_option` Table!"); sObjectMgr->LoadGossipMenuItems(); handler->SendGlobalGMSysMessage("DB table `gossip_menu_option` reloaded."); sConditionMgr->LoadConditions(true); @@ -581,7 +581,7 @@ public: static bool HandleReloadGOQuestRelationsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Loading Quests Relations... (`gameobject_questrelation`)"); + sLog->outString("Loading Quests Relations... (`gameobject_questrelation`)"); sObjectMgr->LoadGameobjectQuestRelations(); handler->SendGlobalGMSysMessage("DB table `gameobject_questrelation` (gameobject quest givers) reloaded."); return true; @@ -589,7 +589,7 @@ public: static bool HandleReloadGOQuestInvRelationsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Loading Quests Relations... (`gameobject_involvedrelation`)"); + sLog->outString("Loading Quests Relations... (`gameobject_involvedrelation`)"); sObjectMgr->LoadGameobjectInvolvedRelations(); handler->SendGlobalGMSysMessage("DB table `gameobject_involvedrelation` (gameobject quest takers) reloaded."); return true; @@ -597,7 +597,7 @@ public: static bool HandleReloadQuestAreaTriggersCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Quest Area Triggers..."); + sLog->outString("Re-Loading Quest Area Triggers..."); sObjectMgr->LoadQuestAreaTriggers(); handler->SendGlobalGMSysMessage("DB table `areatrigger_involvedrelation` (quest area triggers) reloaded."); return true; @@ -605,12 +605,12 @@ public: static bool HandleReloadQuestTemplateCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Quest Templates..."); + sLog->outString("Re-Loading Quest Templates..."); sObjectMgr->LoadQuests(); handler->SendGlobalGMSysMessage("DB table `quest_template` (quest definitions) reloaded."); /// dependent also from `gameobject` but this table not reloaded anyway - sLog.outString("Re-Loading GameObjects for quests..."); + sLog->outString("Re-Loading GameObjects for quests..."); sObjectMgr->LoadGameObjectForQuests(); handler->SendGlobalGMSysMessage("Data GameObjects for quests reloaded."); return true; @@ -618,7 +618,7 @@ public: static bool HandleReloadLootTemplatesCreatureCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`creature_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`creature_loot_template`)"); LoadLootTemplates_Creature(); LootTemplates_Creature.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `creature_loot_template` reloaded."); @@ -628,7 +628,7 @@ public: static bool HandleReloadLootTemplatesDisenchantCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`disenchant_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`disenchant_loot_template`)"); LoadLootTemplates_Disenchant(); LootTemplates_Disenchant.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `disenchant_loot_template` reloaded."); @@ -638,7 +638,7 @@ public: static bool HandleReloadLootTemplatesFishingCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`fishing_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`fishing_loot_template`)"); LoadLootTemplates_Fishing(); LootTemplates_Fishing.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `fishing_loot_template` reloaded."); @@ -648,7 +648,7 @@ public: static bool HandleReloadLootTemplatesGameobjectCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`gameobject_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`gameobject_loot_template`)"); LoadLootTemplates_Gameobject(); LootTemplates_Gameobject.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `gameobject_loot_template` reloaded."); @@ -658,7 +658,7 @@ public: static bool HandleReloadLootTemplatesItemCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`item_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`item_loot_template`)"); LoadLootTemplates_Item(); LootTemplates_Item.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `item_loot_template` reloaded."); @@ -668,7 +668,7 @@ public: static bool HandleReloadLootTemplatesMillingCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`milling_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`milling_loot_template`)"); LoadLootTemplates_Milling(); LootTemplates_Milling.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `milling_loot_template` reloaded."); @@ -678,7 +678,7 @@ public: static bool HandleReloadLootTemplatesPickpocketingCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`pickpocketing_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`pickpocketing_loot_template`)"); LoadLootTemplates_Pickpocketing(); LootTemplates_Pickpocketing.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `pickpocketing_loot_template` reloaded."); @@ -688,7 +688,7 @@ public: static bool HandleReloadLootTemplatesProspectingCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`prospecting_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`prospecting_loot_template`)"); LoadLootTemplates_Prospecting(); LootTemplates_Prospecting.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `prospecting_loot_template` reloaded."); @@ -698,7 +698,7 @@ public: static bool HandleReloadLootTemplatesMailCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`mail_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`mail_loot_template`)"); LoadLootTemplates_Mail(); LootTemplates_Mail.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `mail_loot_template` reloaded."); @@ -708,7 +708,7 @@ public: static bool HandleReloadLootTemplatesReferenceCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`reference_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`reference_loot_template`)"); LoadLootTemplates_Reference(); handler->SendGlobalGMSysMessage("DB table `reference_loot_template` reloaded."); sConditionMgr->LoadConditions(true); @@ -717,7 +717,7 @@ public: static bool HandleReloadLootTemplatesSkinningCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`skinning_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`skinning_loot_template`)"); LoadLootTemplates_Skinning(); LootTemplates_Skinning.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `skinning_loot_template` reloaded."); @@ -727,7 +727,7 @@ public: static bool HandleReloadLootTemplatesSpellCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Loot Tables... (`spell_loot_template`)"); + sLog->outString("Re-Loading Loot Tables... (`spell_loot_template`)"); LoadLootTemplates_Spell(); LootTemplates_Spell.CheckLootRefs(); handler->SendGlobalGMSysMessage("DB table `spell_loot_template` reloaded."); @@ -737,7 +737,7 @@ public: static bool HandleReloadTrinityStringCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading trinity_string Table!"); + sLog->outString("Re-Loading trinity_string Table!"); sObjectMgr->LoadTrinityStrings(); handler->SendGlobalGMSysMessage("DB table `trinity_string` reloaded."); return true; @@ -745,7 +745,7 @@ public: static bool HandleReloadNpcGossipCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `npc_gossip` Table!"); + sLog->outString("Re-Loading `npc_gossip` Table!"); sObjectMgr->LoadNpcTextId(); handler->SendGlobalGMSysMessage("DB table `npc_gossip` reloaded."); return true; @@ -753,7 +753,7 @@ public: static bool HandleReloadNpcTrainerCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `npc_trainer` Table!"); + sLog->outString("Re-Loading `npc_trainer` Table!"); sObjectMgr->LoadTrainerSpell(); handler->SendGlobalGMSysMessage("DB table `npc_trainer` reloaded."); return true; @@ -761,7 +761,7 @@ public: static bool HandleReloadNpcVendorCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `npc_vendor` Table!"); + sLog->outString("Re-Loading `npc_vendor` Table!"); sObjectMgr->LoadVendors(); handler->SendGlobalGMSysMessage("DB table `npc_vendor` reloaded."); return true; @@ -769,7 +769,7 @@ public: static bool HandleReloadPointsOfInterestCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `points_of_interest` Table!"); + sLog->outString("Re-Loading `points_of_interest` Table!"); sObjectMgr->LoadPointsOfInterest(); handler->SendGlobalGMSysMessage("DB table `points_of_interest` reloaded."); return true; @@ -777,7 +777,7 @@ public: static bool HandleReloadQuestPOICommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString( "Re-Loading Quest POI ..." ); + sLog->outString( "Re-Loading Quest POI ..." ); sObjectMgr->LoadQuestPOI(); handler->SendGlobalGMSysMessage("DB Table `quest_poi` and `quest_poi_points` reloaded."); return true; @@ -785,7 +785,7 @@ public: static bool HandleReloadSpellClickSpellsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading `npc_spellclick_spells` Table!"); + sLog->outString("Re-Loading `npc_spellclick_spells` Table!"); sObjectMgr->LoadNPCSpellClickSpells(); handler->SendGlobalGMSysMessage("DB table `npc_spellclick_spells` reloaded."); return true; @@ -793,7 +793,7 @@ public: static bool HandleReloadReservedNameCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Loading ReservedNames... (`reserved_name`)"); + sLog->outString("Loading ReservedNames... (`reserved_name`)"); sObjectMgr->LoadReservedPlayersNames(); handler->SendGlobalGMSysMessage("DB table `reserved_name` (player reserved names) reloaded."); return true; @@ -801,7 +801,7 @@ public: static bool HandleReloadReputationRewardRateCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString( "Re-Loading `reputation_reward_rate` Table!" ); + sLog->outString( "Re-Loading `reputation_reward_rate` Table!" ); sObjectMgr->LoadReputationRewardRate(); handler->SendGlobalSysMessage("DB table `reputation_reward_rate` reloaded."); return true; @@ -809,7 +809,7 @@ public: static bool HandleReloadReputationSpilloverTemplateCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString( "Re-Loading `reputation_spillover_template` Table!" ); + sLog->outString( "Re-Loading `reputation_spillover_template` Table!" ); sObjectMgr->LoadReputationSpilloverTemplate(); handler->SendGlobalSysMessage("DB table `reputation_spillover_template` reloaded."); return true; @@ -817,7 +817,7 @@ public: static bool HandleReloadSkillDiscoveryTemplateCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Skill Discovery Table..."); + sLog->outString("Re-Loading Skill Discovery Table..."); LoadSkillDiscoveryTable(); handler->SendGlobalGMSysMessage("DB table `skill_discovery_template` (recipes discovered at crafting) reloaded."); return true; @@ -825,7 +825,7 @@ public: static bool HandleReloadSkillExtraItemTemplateCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Skill Extra Item Table..."); + sLog->outString("Re-Loading Skill Extra Item Table..."); LoadSkillExtraItemTable(); handler->SendGlobalGMSysMessage("DB table `skill_extra_item_template` (extra item creation when crafting) reloaded."); return true; @@ -833,7 +833,7 @@ public: static bool HandleReloadSkillFishingBaseLevelCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Skill Fishing base level requirements..."); + sLog->outString("Re-Loading Skill Fishing base level requirements..."); sObjectMgr->LoadFishingBaseSkillLevel(); handler->SendGlobalGMSysMessage("DB table `skill_fishing_base_level` (fishing base level for zone/subzone) reloaded."); return true; @@ -841,7 +841,7 @@ public: static bool HandleReloadSpellAreaCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading SpellArea Data..."); + sLog->outString("Re-Loading SpellArea Data..."); sSpellMgr->LoadSpellAreas(); handler->SendGlobalGMSysMessage("DB table `spell_area` (spell dependences from area/quest/auras state) reloaded."); return true; @@ -849,7 +849,7 @@ public: static bool HandleReloadSpellRequiredCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Required Data... "); + sLog->outString("Re-Loading Spell Required Data... "); sSpellMgr->LoadSpellRequired(); handler->SendGlobalGMSysMessage("DB table `spell_required` reloaded."); return true; @@ -857,7 +857,7 @@ public: static bool HandleReloadSpellGroupsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Groups..."); + sLog->outString("Re-Loading Spell Groups..."); sSpellMgr->LoadSpellGroups(); handler->SendGlobalGMSysMessage("DB table `spell_group` (spell groups) reloaded."); return true; @@ -865,7 +865,7 @@ public: static bool HandleReloadSpellLearnSpellCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Learn Spells..."); + sLog->outString("Re-Loading Spell Learn Spells..."); sSpellMgr->LoadSpellLearnSpells(); handler->SendGlobalGMSysMessage("DB table `spell_learn_spell` reloaded."); return true; @@ -873,7 +873,7 @@ public: static bool HandleReloadSpellLinkedSpellCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Linked Spells..."); + sLog->outString("Re-Loading Spell Linked Spells..."); sSpellMgr->LoadSpellLinked(); handler->SendGlobalGMSysMessage("DB table `spell_linked_spell` reloaded."); return true; @@ -881,7 +881,7 @@ public: static bool HandleReloadSpellProcEventCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Proc Event conditions..."); + sLog->outString("Re-Loading Spell Proc Event conditions..."); sSpellMgr->LoadSpellProcEvents(); handler->SendGlobalGMSysMessage("DB table `spell_proc_event` (spell proc trigger requirements) reloaded."); return true; @@ -889,7 +889,7 @@ public: static bool HandleReloadSpellBonusesCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Bonus Data..."); + sLog->outString("Re-Loading Spell Bonus Data..."); sSpellMgr->LoadSpellBonusess(); handler->SendGlobalGMSysMessage("DB table `spell_bonus_data` (spell damage/healing coefficients) reloaded."); return true; @@ -897,7 +897,7 @@ public: static bool HandleReloadSpellTargetPositionCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell target coordinates..."); + sLog->outString("Re-Loading Spell target coordinates..."); sSpellMgr->LoadSpellTargetPositions(); handler->SendGlobalGMSysMessage("DB table `spell_target_position` (destination coordinates for spell targets) reloaded."); return true; @@ -905,7 +905,7 @@ public: static bool HandleReloadSpellThreatsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Aggro Spells Definitions..."); + sLog->outString("Re-Loading Aggro Spells Definitions..."); sSpellMgr->LoadSpellThreats(); handler->SendGlobalGMSysMessage("DB table `spell_threat` (spell aggro definitions) reloaded."); return true; @@ -913,7 +913,7 @@ public: static bool HandleReloadSpellGroupStackRulesCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell Group Stack Rules..."); + sLog->outString("Re-Loading Spell Group Stack Rules..."); sSpellMgr->LoadSpellGroupStackRules(); handler->SendGlobalGMSysMessage("DB table `spell_group_stack_rules` (spell stacking definitions) reloaded."); return true; @@ -921,7 +921,7 @@ public: static bool HandleReloadSpellPetAurasCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Spell pet auras..."); + sLog->outString("Re-Loading Spell pet auras..."); sSpellMgr->LoadSpellPetAuras(); handler->SendGlobalGMSysMessage("DB table `spell_pet_auras` reloaded."); return true; @@ -929,7 +929,7 @@ public: static bool HandleReloadPageTextsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Page Texts..."); + sLog->outString("Re-Loading Page Texts..."); sObjectMgr->LoadPageTexts(); handler->SendGlobalGMSysMessage("DB table `page_texts` reloaded."); return true; @@ -937,7 +937,7 @@ public: static bool HandleReloadItemEnchantementsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Item Random Enchantments Table..."); + sLog->outString("Re-Loading Item Random Enchantments Table..."); LoadRandomEnchantmentsTable(); handler->SendGlobalGMSysMessage("DB table `item_enchantment_template` reloaded."); return true; @@ -945,7 +945,7 @@ public: static bool HandleReloadItemSetNamesCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Item set names..."); + sLog->outString("Re-Loading Item set names..."); LoadRandomEnchantmentsTable(); handler->SendGlobalGMSysMessage("DB table `item_set_names` reloaded."); return true; @@ -953,7 +953,7 @@ public: static bool HandleReloadGossipScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -961,7 +961,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `gossip_scripts`..."); + sLog->outString("Re-Loading Scripts from `gossip_scripts`..."); sObjectMgr->LoadGossipScripts(); @@ -973,7 +973,7 @@ public: static bool HandleReloadGameObjectScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -981,7 +981,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `gameobject_scripts`..."); + sLog->outString("Re-Loading Scripts from `gameobject_scripts`..."); sObjectMgr->LoadGameObjectScripts(); @@ -993,7 +993,7 @@ public: static bool HandleReloadEventScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -1001,7 +1001,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `event_scripts`..."); + sLog->outString("Re-Loading Scripts from `event_scripts`..."); sObjectMgr->LoadEventScripts(); @@ -1013,7 +1013,7 @@ public: static bool HandleReloadWpScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -1021,7 +1021,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `waypoint_scripts`..."); + sLog->outString("Re-Loading Scripts from `waypoint_scripts`..."); sObjectMgr->LoadWaypointScripts(); @@ -1034,7 +1034,7 @@ public: static bool HandleReloadEventAITextsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Texts from `creature_ai_texts`..."); + sLog->outString("Re-Loading Texts from `creature_ai_texts`..."); sEventAIMgr->LoadCreatureEventAI_Texts(); handler->SendGlobalGMSysMessage("DB table `creature_ai_texts` reloaded."); return true; @@ -1042,7 +1042,7 @@ public: static bool HandleReloadEventAISummonsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Summons from `creature_ai_summons`..."); + sLog->outString("Re-Loading Summons from `creature_ai_summons`..."); sEventAIMgr->LoadCreatureEventAI_Summons(); handler->SendGlobalGMSysMessage("DB table `creature_ai_summons` reloaded."); return true; @@ -1050,7 +1050,7 @@ public: static bool HandleReloadEventAIScriptsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Scripts from `creature_ai_scripts`..."); + sLog->outString("Re-Loading Scripts from `creature_ai_scripts`..."); sEventAIMgr->LoadCreatureEventAI_Scripts(); handler->SendGlobalGMSysMessage("DB table `creature_ai_scripts` reloaded."); return true; @@ -1058,7 +1058,7 @@ public: static bool HandleReloadQuestEndScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -1066,7 +1066,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `quest_end_scripts`..."); + sLog->outString("Re-Loading Scripts from `quest_end_scripts`..."); sObjectMgr->LoadQuestEndScripts(); @@ -1078,7 +1078,7 @@ public: static bool HandleReloadQuestStartScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -1086,7 +1086,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `quest_start_scripts`..."); + sLog->outString("Re-Loading Scripts from `quest_start_scripts`..."); sObjectMgr->LoadQuestStartScripts(); @@ -1098,7 +1098,7 @@ public: static bool HandleReloadSpellScriptsCommand(ChatHandler* handler, const char* args) { - if (sWorld.IsScriptScheduled()) + if (sWorld->IsScriptScheduled()) { handler->SendSysMessage("DB scripts used currently, please attempt reload later."); handler->SetSentErrorMessage(true); @@ -1106,7 +1106,7 @@ public: } if (*args != 'a') - sLog.outString("Re-Loading Scripts from `spell_scripts`..."); + sLog->outString("Re-Loading Scripts from `spell_scripts`..."); sObjectMgr->LoadSpellScripts(); @@ -1118,7 +1118,7 @@ public: static bool HandleReloadDbScriptStringCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Script strings from `db_script_string`..."); + sLog->outString("Re-Loading Script strings from `db_script_string`..."); sObjectMgr->LoadDbScriptStrings(); handler->SendGlobalGMSysMessage("DB table `db_script_string` reloaded."); return true; @@ -1126,7 +1126,7 @@ public: static bool HandleReloadGameGraveyardZoneCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Graveyard-zone links..."); + sLog->outString("Re-Loading Graveyard-zone links..."); sObjectMgr->LoadGraveyardZones(); @@ -1137,7 +1137,7 @@ public: static bool HandleReloadGameTeleCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Game Tele coordinates..."); + sLog->outString("Re-Loading Game Tele coordinates..."); sObjectMgr->LoadGameTele(); @@ -1148,9 +1148,9 @@ public: static bool HandleReloadDisablesCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading disables table..."); + sLog->outString("Re-Loading disables table..."); sDisableMgr->LoadDisables(); - sLog.outString("Checking quest disables..."); + sLog->outString("Checking quest disables..."); sDisableMgr->CheckQuestDisables(); handler->SendGlobalGMSysMessage("DB table `disables` reloaded."); return true; @@ -1158,7 +1158,7 @@ public: static bool HandleReloadLocalesAchievementRewardCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Achievement Reward Data..."); + sLog->outString("Re-Loading Locales Achievement Reward Data..."); sAchievementMgr->LoadRewardLocales(); handler->SendGlobalGMSysMessage("DB table `locales_achievement_reward` reloaded."); return true; @@ -1166,7 +1166,7 @@ public: static bool HandleReloadLfgEncountersCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading dungeon encounter lfg associations..."); + sLog->outString("Re-Loading dungeon encounter lfg associations..."); sLFGMgr->LoadDungeonEncounters(); handler->SendGlobalGMSysMessage("DB table `lfg_dungeon_encounters` reloaded."); return true; @@ -1174,7 +1174,7 @@ public: static bool HandleReloadLfgRewardsCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading lfg dungeon rewards..."); + sLog->outString("Re-Loading lfg dungeon rewards..."); sLFGMgr->LoadRewards(); handler->SendGlobalGMSysMessage("DB table `lfg_dungeon_rewards` reloaded."); return true; @@ -1182,7 +1182,7 @@ public: static bool HandleReloadLocalesCreatureCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Creature ..."); + sLog->outString("Re-Loading Locales Creature ..."); sObjectMgr->LoadCreatureLocales(); handler->SendGlobalGMSysMessage("DB table `locales_creature` reloaded."); return true; @@ -1190,7 +1190,7 @@ public: static bool HandleReloadLocalesGameobjectCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Gameobject ... "); + sLog->outString("Re-Loading Locales Gameobject ... "); sObjectMgr->LoadGameObjectLocales(); handler->SendGlobalGMSysMessage("DB table `locales_gameobject` reloaded."); return true; @@ -1198,7 +1198,7 @@ public: static bool HandleReloadLocalesGossipMenuOptionCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString( "Re-Loading Locales Gossip Menu Option ... "); + sLog->outString( "Re-Loading Locales Gossip Menu Option ... "); sObjectMgr->LoadGossipMenuItemsLocales(); handler->SendGlobalGMSysMessage("DB table `locales_gossip_menu_option` reloaded."); return true; @@ -1206,7 +1206,7 @@ public: static bool HandleReloadLocalesItemCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Item ... "); + sLog->outString("Re-Loading Locales Item ... "); sObjectMgr->LoadItemLocales(); handler->SendGlobalGMSysMessage("DB table `locales_item` reloaded."); return true; @@ -1214,7 +1214,7 @@ public: static bool HandleReloadLocalesItemSetNameCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Item set name... "); + sLog->outString("Re-Loading Locales Item set name... "); sObjectMgr->LoadItemSetNameLocales(); handler->SendGlobalGMSysMessage("DB table `locales_item_set_name` reloaded."); return true; @@ -1222,7 +1222,7 @@ public: static bool HandleReloadLocalesNpcTextCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales NPC Text ... "); + sLog->outString("Re-Loading Locales NPC Text ... "); sObjectMgr->LoadNpcTextLocales(); handler->SendGlobalGMSysMessage("DB table `locales_npc_text` reloaded."); return true; @@ -1230,7 +1230,7 @@ public: static bool HandleReloadLocalesPageTextCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Page Text ... "); + sLog->outString("Re-Loading Locales Page Text ... "); sObjectMgr->LoadPageTextLocales(); handler->SendGlobalGMSysMessage("DB table `locales_page_text` reloaded."); return true; @@ -1238,7 +1238,7 @@ public: static bool HandleReloadLocalesPointsOfInterestCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Points Of Interest ... "); + sLog->outString("Re-Loading Locales Points Of Interest ... "); sObjectMgr->LoadPointOfInterestLocales(); handler->SendGlobalGMSysMessage("DB table `locales_points_of_interest` reloaded."); return true; @@ -1246,7 +1246,7 @@ public: static bool HandleReloadLocalesQuestCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Locales Quest ... "); + sLog->outString("Re-Loading Locales Quest ... "); sObjectMgr->LoadQuestLocales(); handler->SendGlobalGMSysMessage("DB table `locales_quest` reloaded."); return true; @@ -1254,7 +1254,7 @@ public: static bool HandleReloadMailLevelRewardCommand(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Player level dependent mail rewards..."); + sLog->outString("Re-Loading Player level dependent mail rewards..."); sObjectMgr->LoadMailLevelRewards(); handler->SendGlobalGMSysMessage("DB table `mail_level_reward` reloaded."); return true; @@ -1263,7 +1263,7 @@ public: static bool HandleReloadAuctionsCommand(ChatHandler* handler, const char* /*args*/) { ///- Reload dynamic data tables from the database - sLog.outString("Re-Loading Auctions..."); + sLog->outString("Re-Loading Auctions..."); sAuctionMgr->LoadAuctionItems(); sAuctionMgr->LoadAuctions(); handler->SendGlobalGMSysMessage("Auctions reloaded."); @@ -1272,7 +1272,7 @@ public: static bool HandleReloadConditions(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Conditions..."); + sLog->outString("Re-Loading Conditions..."); sConditionMgr->LoadConditions(true); handler->SendGlobalGMSysMessage("Conditions reloaded."); return true; @@ -1280,7 +1280,7 @@ public: static bool HandleReloadCreatureText(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Creature Texts..."); + sLog->outString("Re-Loading Creature Texts..."); sCreatureTextMgr->LoadCreatureTexts(); handler->SendGlobalGMSysMessage("Creature Texts reloaded."); return true; @@ -1288,7 +1288,7 @@ public: static bool HandleReloadSmartScripts(ChatHandler* handler, const char* /*args*/) { - sLog.outString("Re-Loading Smart Scripts..."); + sLog->outString("Re-Loading Smart Scripts..."); sSmartScriptMgr->LoadSmartAIFromDB(); handler->SendGlobalGMSysMessage("Smart Scripts reloaded."); return true; diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp index 17e2ef27907..d235ba7a10d 100644 --- a/src/server/scripts/Commands/cs_wp.cpp +++ b/src/server/scripts/Commands/cs_wp.cpp @@ -75,7 +75,7 @@ public: */ static bool HandleWpAddCommand(ChatHandler* handler, const char* args) { - sLog.outDebug("DEBUG: HandleWpAddCommand"); + sLog->outDebug("DEBUG: HandleWpAddCommand"); // optional char* path_number = NULL; @@ -96,7 +96,7 @@ public: QueryResult result = WorldDatabase.Query("SELECT MAX(id) FROM waypoint_data"); uint32 maxpathid = result->Fetch()->GetInt32(); pathid = maxpathid+1; - sLog.outDebug("DEBUG: HandleWpAddCommand - New path started."); + sLog->outDebug("DEBUG: HandleWpAddCommand - New path started."); handler->PSendSysMessage("%s%s|r", "|cff00ff00", "New path started."); } } @@ -108,12 +108,12 @@ public: if (!pathid) { - sLog.outDebug("DEBUG: HandleWpAddCommand - Current creature haven't loaded path."); + sLog->outDebug("DEBUG: HandleWpAddCommand - Current creature haven't loaded path."); handler->PSendSysMessage("%s%s|r", "|cffff33ff", "Current creature haven't loaded path."); return true; } - sLog.outDebug("DEBUG: HandleWpAddCommand - point == 0"); + sLog->outDebug("DEBUG: HandleWpAddCommand - point == 0"); QueryResult result = WorldDatabase.PQuery("SELECT MAX(point) FROM waypoint_data WHERE id = '%u'",pathid); @@ -147,7 +147,7 @@ public: // Did player provide a path_id? if (!path_number) - sLog.outDebug("DEBUG: HandleWpLoadPathCommand - No path number provided"); + sLog->outDebug("DEBUG: HandleWpLoadPathCommand - No path number provided"); if (!target) { @@ -452,7 +452,7 @@ public: static bool HandleWpModifyCommand(ChatHandler* handler, const char* args) { - sLog.outDebug("DEBUG: HandleWpModifyCommand"); + sLog->outDebug("DEBUG: HandleWpModifyCommand"); if (!*args) return false; @@ -491,7 +491,7 @@ public: return false; } - sLog.outDebug("DEBUG: HandleWpModifyCommand - User did select an NPC"); + sLog->outDebug("DEBUG: HandleWpModifyCommand - User did select an NPC"); // The visual waypoint Creature* wpCreature = NULL; wpGuid = target->GetGUIDLow(); @@ -513,7 +513,7 @@ public: if (!result) { - sLog.outDebug("DEBUG: HandleWpModifyCommand - No waypoint found - used 'wpguid'"); + sLog->outDebug("DEBUG: HandleWpModifyCommand - No waypoint found - used 'wpguid'"); handler->PSendSysMessage(LANG_WAYPOINT_NOTFOUNDSEARCH, target->GetGUIDLow()); // Select waypoint number from database @@ -531,7 +531,7 @@ public: return true; } } - sLog.outDebug("DEBUG: HandleWpModifyCommand - After getting wpGuid"); + sLog->outDebug("DEBUG: HandleWpModifyCommand - After getting wpGuid"); do { @@ -546,7 +546,7 @@ public: arg_str = strtok((char*)NULL, " "); } - sLog.outDebug("DEBUG: HandleWpModifyCommand - Parameters parsed - now execute the command"); + sLog->outDebug("DEBUG: HandleWpModifyCommand - Parameters parsed - now execute the command"); // Check for argument if (show != "del" && show != "move" && arg_str == NULL) @@ -644,7 +644,7 @@ public: static bool HandleWpShowCommand(ChatHandler* handler, const char* args) { - sLog.outDebug("DEBUG: HandleWpShowCommand"); + sLog->outDebug("DEBUG: HandleWpShowCommand"); if (!*args) return false; @@ -656,7 +656,7 @@ public: // second arg: GUID (optional, if a creature is selected) char* guid_str = strtok((char*)NULL, " "); - sLog.outDebug("DEBUG: HandleWpShowCommand: show_str: %s guid_str: %s", show_str, guid_str); + sLog->outDebug("DEBUG: HandleWpShowCommand: show_str: %s guid_str: %s", show_str, guid_str); uint32 pathid = 0; Creature* target = handler->getSelectedCreature(); @@ -665,7 +665,7 @@ public: if (!guid_str) { - sLog.outDebug("DEBUG: HandleWpShowCommand: !guid_str"); + sLog->outDebug("DEBUG: HandleWpShowCommand: !guid_str"); // No PathID provided // -> Player must have selected a creature @@ -680,7 +680,7 @@ public: } else { - sLog.outDebug("|cff00ff00DEBUG: HandleWpShowCommand: PathID provided|r"); + sLog->outDebug("|cff00ff00DEBUG: HandleWpShowCommand: PathID provided|r"); // PathID provided // Warn if player also selected a creature // -> Creature selection is ignored <- @@ -690,12 +690,12 @@ public: pathid = atoi((char*)guid_str); } - sLog.outDebug("DEBUG: HandleWpShowCommand: danach"); + sLog->outDebug("DEBUG: HandleWpShowCommand: danach"); std::string show = show_str; uint32 Maxpoint; - sLog.outDebug("DEBUG: HandleWpShowCommand: PathID: %u", pathid); + sLog->outDebug("DEBUG: HandleWpShowCommand: PathID: %u", pathid); //handler->PSendSysMessage("wpshow - show: %s", show); @@ -811,7 +811,7 @@ public: return false; } - sLog.outDebug("DEBUG: UPDATE waypoint_data SET wpguid = '%u' WHERE id = '%u' and point = '%u'", wpCreature->GetGUIDLow(), pathid, point); + sLog->outDebug("DEBUG: UPDATE waypoint_data SET wpguid = '%u' WHERE id = '%u' and point = '%u'", wpCreature->GetGUIDLow(), pathid, point); // set "wpguid" column to the visual waypoint WorldDatabase.PExecute("UPDATE waypoint_data SET wpguid = '%u' WHERE id = '%u' and point = '%u'", wpCreature->GetGUIDLow(), pathid, point); -- cgit v1.2.3