Added support for reloading creature_onkill_reputation table

Commented ace in externals/CmakeLists.txt and moved zlib before g3dlite, requested by click

--HG--
branch : trunk

7 files changed, 22 insertions, 5 deletions

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index f74c476ac4c..320a40c7377 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -1,7 +1,7 @@
-add_subdirectory(ace)
+#add_subdirectory(ace)
 #add_subdirectory(bzip2)
+add_subdirectory(zlib)
 add_subdirectory(g3dlite)
 add_subdirectory(jemalloc)
 #add_subdirectory(libmpq)
 add_subdirectory(sockets)
-add_subdirectory(zlib)
diff --git a/sql/updates/8512_world_command.sql b/sql/updates/8512_world_command.sql
new file mode 100644
index 00000000000..6293503d492
--- /dev/null
+++ b/sql/updates/8512_world_command.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name`='reload creature_onkill_reputation';
+INSERT INTO `command` VALUES 
+('reload creature_onkill_reputation','3','Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.');
diff --git a/sql/world_database.sql b/sql/world_database.sql
index b589f3b1b0f..9d808f9926e 100644
--- a/sql/world_database.sql
+++ b/sql/world_database.sql
@@ -571,6 +571,7 @@ INSERT INTO `command` VALUES
 ('reload creature_involvedrelation',3,'Syntax: .reload creature_involvedrelation\nReload creature_involvedrelation table.'),
 ('reload creature_linked_respawn',2,'Syntax: .reload creature_linked_respawn\r\nReload creature_linked_respawn table.'),
 ('reload creature_loot_template',3,'Syntax: .reload creature_loot_template\nReload creature_loot_template table.'),
+('reload creature_onkill_reputation','3','Syntax: .reload creature_onkill_reputation\r\nReload creature_onkill_reputation table.'),
 ('reload creature_questrelation',3,'Syntax: .reload creature_questrelation\nReload creature_questrelation table.'),
 ('reload disenchant_loot_template',3,'Syntax: .reload disenchant_loot_template\nReload disenchant_loot_template table.'),
 ('reload event_scripts',3,'Syntax: .reload event_scripts\nReload event_scripts table.'),
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 0d9f1485d20..66d867e4a69 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -460,6 +460,7 @@ ChatCommand * ChatHandler::getCommandTable()
         { "creature_involvedrelation",   SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestInvRelationsCommand,"",NULL },
         { "creature_linked_respawn",     SEC_GAMEMASTER, true,  &ChatHandler::HandleReloadCreatureLinkedRespawnCommand,   "", NULL },
         { "creature_loot_template",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadLootTemplatesCreatureCommand,   "", NULL },
+        { "creature_onkill_reputation",  SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadOnKillReputationCommand,        "", NULL },
         { "creature_questrelation",      SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureQuestRelationsCommand,  "", NULL },
         { "creature_template",           SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadCreatureTemplateCommand,        "", NULL },
         //{ "db_script_string",            SEC_ADMINISTRATOR, true,  &ChatHandler::HandleReloadDbScriptStringCommand,          "", NULL },
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 6aa42995663..8da2979ae82 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -364,6 +364,7 @@ class ChatHandler
         bool HandleReloadEventAISummonsCommand(const char* args);
         bool HandleReloadEventAIScriptsCommand(const char* args);
         bool HandleReloadCommandCommand(const char* args);
+        bool HandleReloadOnKillReputationCommand(const char* args);
         bool HandleReloadCreatureTemplateCommand(const char* args);
         bool HandleReloadCreatureQuestRelationsCommand(const char* args);
         bool HandleReloadCreatureQuestInvRelationsCommand(const char* args);
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index deabbe62871..77d07a6f406 100644
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -749,6 +749,14 @@ bool ChatHandler::HandleReloadCommandCommand(const char*)
     return true;
 }
 
+bool ChatHandler::HandleReloadOnKillReputationCommand(const char*)
+{
+    sLog.outString("Re-Loading creature award reputation definitions...");
+    objmgr.LoadReputationOnKill();
+    SendGlobalGMSysMessage("DB table `creature_onkill_reputation` reloaded.");
+    return true;
+}
+
 bool ChatHandler::HandleReloadCreatureTemplateCommand(const char* args)
 {
     if (!*args)
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 7290af9d3fa..07e2607d13c 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -6488,6 +6488,9 @@ void ObjectMgr::LoadCorpses()
 
 void ObjectMgr::LoadReputationOnKill()
 {
+    // For reload case
+    mRepOnKill.clear();
+
     uint32 count = 0;
 
     //                                                0            1                     2
@@ -6529,7 +6532,7 @@ void ObjectMgr::LoadReputationOnKill()
 
         if (!GetCreatureTemplate(creature_id))
         {
-            sLog.outErrorDb("Table `creature_onkill_reputation` have data for not existed creature entry (%u), skipped",creature_id);
+            sLog.outErrorDb("Table `creature_onkill_reputation` have data for not existed creature entry (%u), skipped", creature_id);
             continue;
         }
 
@@ -6538,7 +6541,7 @@ void ObjectMgr::LoadReputationOnKill()
             FactionEntry const *factionEntry1 = sFactionStore.LookupEntry(repOnKill.repfaction1);
             if (!factionEntry1)
             {
-                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`",repOnKill.repfaction1);
+                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction1);
                 continue;
             }
         }
@@ -6548,7 +6551,7 @@ void ObjectMgr::LoadReputationOnKill()
             FactionEntry const *factionEntry2 = sFactionStore.LookupEntry(repOnKill.repfaction2);
             if (!factionEntry2)
             {
-                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`",repOnKill.repfaction2);
+                sLog.outErrorDb("Faction (faction.dbc) %u does not exist but is used in `creature_onkill_reputation`", repOnKill.repfaction2);
                 continue;
             }
         }