aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/scripts/Commands/cs_reload.cpp6
-rw-r--r--src/server/scripts/Kalimdor/orgrimmar.cpp9
2 files changed, 3 insertions, 12 deletions
diff --git a/src/server/scripts/Commands/cs_reload.cpp b/src/server/scripts/Commands/cs_reload.cpp
index d7c3a204f8a..dee2ad03ba7 100644
--- a/src/server/scripts/Commands/cs_reload.cpp
+++ b/src/server/scripts/Commands/cs_reload.cpp
@@ -79,7 +79,7 @@ public:
{ "creature_ai_summons", SEC_ADMINISTRATOR, true, &HandleReloadEventAISummonsCommand, "", NULL },
{ "creature_ai_texts", SEC_ADMINISTRATOR, true, &HandleReloadEventAITextsCommand, "", NULL },
{ "creature_involvedrelation", SEC_ADMINISTRATOR, true, &HandleReloadCreatureQuestInvRelationsCommand, "",NULL },
- { "creature_linked_respawn", SEC_GAMEMASTER, true, &HandleReloadCreatureLinkedRespawnCommand, "", NULL },
+ { "creature_linked_respawn", SEC_GAMEMASTER, true, &HandleReloadLinkedRespawnCommand, "", NULL },
{ "creature_loot_template", SEC_ADMINISTRATOR, true, &HandleReloadLootTemplatesCreatureCommand, "", NULL },
{ "creature_onkill_reputation", SEC_ADMINISTRATOR, true, &HandleReloadOnKillReputationCommand, "", NULL },
{ "creature_questrelation", SEC_ADMINISTRATOR, true, &HandleReloadCreatureQuestRelationsCommand, "", NULL },
@@ -545,10 +545,10 @@ public:
return true;
}
- static bool HandleReloadCreatureLinkedRespawnCommand(ChatHandler* handler, const char* /*args*/)
+ static bool HandleReloadLinkedRespawnCommand(ChatHandler* handler, const char* /*args*/)
{
sLog->outString("Loading Linked Respawns... (`creature_linked_respawn`)");
- sObjectMgr->LoadCreatureLinkedRespawn();
+ sObjectMgr->LoadLinkedRespawn();
handler->SendGlobalGMSysMessage("DB table `creature_linked_respawn` (creature linked respawns) reloaded.");
return true;
}
diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/orgrimmar.cpp
index 533445bf6c3..375d6f9dcb8 100644
--- a/src/server/scripts/Kalimdor/orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/orgrimmar.cpp
@@ -31,15 +31,6 @@ EndContentData */
#include "ScriptPCH.h"
/*######
-## npc_neeru_fireblade
-######*/
-
-#define QUEST_5727 5727
-
-#define GOSSIP_HNF "You may speak frankly, Neeru..."
-#define GOSSIP_SNF "[PH] ..."
-
-/*######
## npc_shenthul
######*/