From 2eb70164ea64442218e99f6588a731a9d24e6bbb Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Wed, 27 Dec 2017 18:10:43 +0100
Subject: [PATCH] Scripts/LCT: minimize differences between 434 branch

---
 .../boss_lockmaw_and_augh.cpp                 |  2 +-
 .../instance_lost_city_of_the_tolvir.cpp      | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
index 937b30df057..9dbf44074f2 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp
@@ -390,7 +390,7 @@ class npc_lockmaw_frenzied_crocolisk : public CreatureScript
                 me->DespawnOrUnsummon(Seconds(5));
             }
 
-            void IsSummonedBy(Unit* summoner) override
+            void IsSummonedBy(Unit* /*summoner*/) override
             {
                 if (Creature* lockmaw = _instance->GetCreature(DATA_LOCKMAW))
                     lockmaw->AI()->JustSummoned(me);
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
index 7eaecf14461..abcd8dcd970 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp
@@ -80,7 +80,7 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
 
             void Initialize()
             {
-                _heroicAughSpawned = false;
+                heroicAughSpawned = false;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -101,14 +101,14 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
                     case DATA_LOCKMAW:
                         if (!instance->IsHeroic() && state == DONE)
                             SetBossState(DATA_LOCKMAW_AND_AUGH, DONE);
-                        else if (instance->IsHeroic() && state == DONE && !_heroicAughSpawned)
-                            _events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(4));
+                        else if (instance->IsHeroic() && state == DONE && !heroicAughSpawned)
+                            events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(4));
                         break;
                     case DATA_AUGH: // Since Augh is summoned, we need to handle his respawn here
                         if (state == DONE)
                             SetBossState(DATA_LOCKMAW_AND_AUGH, DONE);
                         else if (state == FAIL)
-                            _events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(30));
+                            events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(30));
                         break;
                     case DATA_GENERAL_HUSAM:
                     case DATA_LOCKMAW_AND_AUGH:
@@ -192,18 +192,18 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
 
             void Update(uint32 diff) override
             {
-                _events.Update(diff);
+                events.Update(diff);
 
-                while (uint32 eventId = _events.ExecuteEvent())
+                while (uint32 eventId = events.ExecuteEvent())
                 {
                     switch (eventId)
                     {
                         case EVENT_SPAWN_AUGH:
-                            if (!_heroicAughSpawned)
+                            if (!heroicAughSpawned)
                             {
                                 if (Creature* augh = instance->SummonCreature(BOSS_AUGH, AughSpawnPos))
                                     augh->AI()->DoAction(ACTION_AUGH_INTRO);
-                                _heroicAughSpawned = true;
+                                heroicAughSpawned = true;
                             }
                             else if (_heroicAughSpawned)
                                 if (Creature* augh = instance->SummonCreature(BOSS_AUGH, AughHomePos))
@@ -216,8 +216,8 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript
             }
 
         protected:
-            EventMap _events;
-            bool _heroicAughSpawned;
+            EventMap events;
+            bool heroicAughSpawned;
             GuidVector addStalkerGUIDs;
         };