Core/Scripting: Misc clean up and a warning fix

This commit is contained in:
Malcrom committed 2013-01-07 21:47:38 -03:30
1 parent 6ba128b2b2
commit 0105bc849f
10 files changed
+74 -65

No files matched your search

@@ -57,7 +57,7 @@ enum Yells
SAY_SLAY = 3,
SAY_DEATH = 4,
SAY_FEED = 5,
SAY_VANISH = 6,
SAY_VANISH = 6
};
enum CombatPhase
{
@@ -25,7 +25,7 @@
#include "Vehicle.h"
#include "GridNotifiers.h"
enum ScriptTexts
enum Say
{
// Festergut
SAY_FESTERGUT_GASEOUS_BLIGHT = 0,
@@ -45,7 +45,7 @@ enum ScriptTexts
EMOTE_CHOKING_GAS_BOMB = 10,
SAY_KILL = 11,
SAY_BERSERK = 12,
SAY_DEATH = 13,
SAY_DEATH = 13
};
enum Spells
@@ -135,7 +135,7 @@ enum Events
EVENT_CHOKING_GAS_BOMB = 12,
EVENT_UNBOUND_PLAGUE = 13,
EVENT_MUTATED_PLAGUE = 14,
EVENT_PHASE_TRANSITION = 15,
EVENT_PHASE_TRANSITION = 15
};
enum Phases
@@ -148,14 +148,14 @@ enum Phases
PHASE_COMBAT_3 = 6,
PHASE_MASK_COMBAT = (1 << PHASE_COMBAT_1) | (1 << PHASE_COMBAT_2) | (1 << PHASE_COMBAT_3),
PHASE_MASK_NOT_SELF = (1 << PHASE_FESTERGUT) | (1 << PHASE_ROTFACE),
PHASE_MASK_NOT_SELF = (1 << PHASE_FESTERGUT) | (1 << PHASE_ROTFACE)
};
enum Points
{
POINT_FESTERGUT = 366260,
POINT_ROTFACE = 366270,
POINT_TABLE = 366780,
POINT_TABLE = 366780
};
Position const festergutWatchPos = {4324.820f, 3166.03f, 389.3831f, 3.316126f}; //emote 432 (release gas)
@@ -169,7 +169,7 @@ enum PutricideData
{
DATA_EXPERIMENT_STAGE = 1,
DATA_PHASE = 2,
DATA_ABOMINATION = 3,
DATA_ABOMINATION = 3
};
#define EXPERIMENT_STATE_OOZE false