diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-08-05 22:55:06 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-08-05 22:55:06 +0100 |
| commit | 2bd4049890175b392a642e6f701ec178c3e5cd43 (patch) | |
| tree | a1c265201e73c634455b6f51869e45606681904e /src | |
| parent | df6e66555b9951b3257c75cfbc240ea612e366aa (diff) | |
Scripts/Commands: Fix compile (v2)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 3 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 3 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 8 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 8a1eb78250b..56f4e7142a2 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -628,7 +628,8 @@ enum UnitFlags UNIT_FLAG_UNK_28 = 0x10000000, UNIT_FLAG_UNK_29 = 0x20000000, // used in Feing Death spell UNIT_FLAG_SHEATHE = 0x40000000, - UNIT_FLAG_UNK_31 = 0x80000000 + UNIT_FLAG_UNK_31 = 0x80000000, + MAX_UNIT_FLAGS = 33 }; // Value masks for UNIT_FIELD_FLAGS_2 diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 4d5245cffb1..e561d37ed36 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -1233,7 +1233,8 @@ enum Mechanics MECHANIC_DISCOVERY = 28, MECHANIC_IMMUNE_SHIELD = 29, // Divine (Blessing) Shield/Protection and Ice Block MECHANIC_SAPPED = 30, - MECHANIC_ENRAGED = 31 + MECHANIC_ENRAGED = 31, + MAX_MECHANIC = 32 }; // Used for spell 42292 Immune Movement Impairment and Loss of Control (0x49967ca6) diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 80d8f410823..881fca6374a 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -75,9 +75,7 @@ struct MechanicImmune char const* text; }; -#define MECHANIC_MAX 33 - -MechanicImmune const mechanicImmunes[MECHANIC_MAX] = +MechanicImmune const mechanicImmunes[MAX_MECHANIC] = { { MECHANIC_NONE , "MECHANIC_NONE" }, { MECHANIC_CHARM , "MECHANIC_CHARM" }, @@ -120,9 +118,7 @@ struct UnitFlag char const* text; }; -#define UNIT_FLAGS_MAX 33 - -UnitFlag const unitFlags[UNIT_FLAGS_MAX] = +UnitFlag const unitFlags[MAX_UNIT_FLAGS] = { { UNIT_FLAG_SERVER_CONTROLLED , "UNIT_FLAG_SERVER_CONTROLLED" }, { UNIT_FLAG_NON_ATTACKABLE , "UNIT_FLAG_NON_ATTACKABLE" }, |