From 7ddb8a7486c6967e89f40b02a399c20112af9c66 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Fri, 17 Feb 2017 16:11:51 +0100 Subject: [PATCH] Coding standards --- ...9_00_world.sql => 2017_02_17_06_world.sql} | 0 .../TheStockade/the_stockade.h | 26 +++++++++---------- .../eastern_kingdoms_script_loader.cpp | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename sql/updates/world/4.3.4/{9999_99_99_00_world.sql => 2017_02_17_06_world.sql} (100%) diff --git a/sql/updates/world/4.3.4/9999_99_99_00_world.sql b/sql/updates/world/4.3.4/2017_02_17_06_world.sql similarity index 100% rename from sql/updates/world/4.3.4/9999_99_99_00_world.sql rename to sql/updates/world/4.3.4/2017_02_17_06_world.sql diff --git a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h index 257c0a936a..d4d8b52bd1 100644 --- a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h +++ b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h @@ -26,28 +26,28 @@ uint32 const EncounterCount = 3; enum SSDataTypes { - DATA_RANDOLPH_MOLOCH = 0, - DATA_LORD_OVERHEAT = 1, - DATA_HOGGER = 2 + DATA_RANDOLPH_MOLOCH = 0, + DATA_LORD_OVERHEAT = 1, + DATA_HOGGER = 2 }; enum SSCreatureIds { - NPC_RANDOLPH_MOLOCH = 46383, - NPC_LORD_OVERHEAT = 46264, - NPC_HOGGER = 46254, - NPC_WARDEN_THELWATER = 46409, - NPC_MORTIMER_MOLOCH = 46482 + NPC_RANDOLPH_MOLOCH = 46383, + NPC_LORD_OVERHEAT = 46264, + NPC_HOGGER = 46254, + NPC_WARDEN_THELWATER = 46409, + NPC_MORTIMER_MOLOCH = 46482 }; template CreatureAI* GetStormwindStockadeAI(Creature* creature) { - if (InstanceMap* instance = creature->GetMap()->ToInstanceMap()) - if (instance->GetInstanceScript()) - if (instance->GetScriptId() == sObjectMgr->GetScriptId(StormwindStockadeScriptName)) - return new AI(creature); - return NULL; + if (InstanceMap* instance = creature->GetMap()->ToInstanceMap()) + if (instance->GetInstanceScript()) + if (instance->GetScriptId() == sObjectMgr->GetScriptId(StormwindStockadeScriptName)) + return new AI(creature); + return NULL; } #endif diff --git a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp index 956be95605..345ab6f9e6 100644 --- a/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp +++ b/src/server/scripts/EasternKingdoms/eastern_kingdoms_script_loader.cpp @@ -342,7 +342,7 @@ void AddEasternKingdomsScripts() AddSC_boss_kiljaeden(); AddSC_sunwell_plateau(); AddSC_instance_the_stockade(); //The Stockade - AddSC_boss_randolph_moloch(); + AddSC_boss_randolph_moloch(); AddSC_boss_archaedas(); //Uldaman AddSC_boss_ironaya(); AddSC_uldaman();