sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Scripts/Stratholme): fix warnings and made code more readable (#3433)

Browse Source
This commit is contained in:
Francesco Borzì
2020-09-06 17:07:36 +02:00
committed by GitHub
parent d6646f8a81
commit b95c14f91a
1 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+36 -16
View File
@@ -426,32 +426,28 @@ class instance_stratholme : public InstanceMapScript
} }
} }
int gate = 1; const int GATE1 = 0;
const int GATE2 = 1;
switch (events.ExecuteEvent()) switch (events.ExecuteEvent())
{ {
case EVENT_GATE1_TRAP: case EVENT_GATE1_TRAP:
gate = 0; _gateTrapsCooldown[GATE1] = false;
break;
case EVENT_GATE2_TRAP: case EVENT_GATE2_TRAP:
_gateTrapsCooldown[gate] = false; _gateTrapsCooldown[GATE2] = false;
break; break;
case EVENT_GATE1_DELAY: case EVENT_GATE1_DELAY:
gate = 0; gate_delay(GATE1);
break;
case EVENT_GATE2_DELAY: case EVENT_GATE2_DELAY:
if (_trapGatesGUIDs[2 * gate]) gate_delay(GATE2);
DoUseDoorOrButton(_trapGatesGUIDs[2 * gate]);
if (_trapGatesGUIDs[2 * gate + 1])
DoUseDoorOrButton(_trapGatesGUIDs[2 * gate + 1]);
break; break;
case EVENT_GATE1_CRITTER_DELAY: case EVENT_GATE1_CRITTER_DELAY:
gate = 0; gate_critter_delay(GATE1);
break;
case EVENT_GATE2_CRITTER_DELAY: case EVENT_GATE2_CRITTER_DELAY:
if (_trappedPlayerGUID) gate_critter_delay(GATE2);
{
if (Player* pPlayer = instance->GetPlayer(_trappedPlayerGUID))
{
DoSpawnPlaguedCritters(gate, pPlayer);
}
}
break; break;
case EVENT_BARON_TIME: case EVENT_BARON_TIME:
{ {
@@ -565,8 +561,32 @@ class instance_stratholme : public InstanceMapScript
bool _gateTrapsCooldown[2]; bool _gateTrapsCooldown[2];
uint64 _trappedPlayerGUID; uint64 _trappedPlayerGUID;
uint64 _trapGatesGUIDs[4]; uint64 _trapGatesGUIDs[4];
void gate_delay(int gate)
{
if (_trapGatesGUIDs[2 * gate])
{
DoUseDoorOrButton(_trapGatesGUIDs[2 * gate]);
}
if (_trapGatesGUIDs[2 * gate + 1])
{
DoUseDoorOrButton(_trapGatesGUIDs[2 * gate + 1]);
}
}
void gate_critter_delay(int gate)
{
if (_trappedPlayerGUID)
{
if (Player* pPlayer = instance->GetPlayer(_trappedPlayerGUID))
{
DoSpawnPlaguedCritters(gate, pPlayer);
}
}
}
}; };
InstanceScript* GetInstanceScript(InstanceMap* map) const InstanceScript* GetInstanceScript(InstanceMap* map) const
{ {
return new instance_stratholme_InstanceMapScript(map); return new instance_stratholme_InstanceMapScript(map);