diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-07-30 11:42:08 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-07-30 11:42:08 +0200 |
| commit | 19d71fb2061aa251c232aaeb2df8121427d6c5d4 (patch) | |
| tree | 26075716f89395cf3c4813fe17e985b4dca350c9 | |
| parent | 00b10c6b349519d9ae5e7bd7eff246f8e389d319 (diff) | |
Contrib/Misc: Allow enumutils_describe.py to better deal with commented-out enum lines
| -rw-r--r-- | contrib/enumutils_describe.py | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/enuminfo_CreatureData.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/enuminfo_SharedDefines.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/contrib/enumutils_describe.py b/contrib/enumutils_describe.py index be615bae432..29380e818f0 100644 --- a/contrib/enumutils_describe.py +++ b/contrib/enumutils_describe.py @@ -27,7 +27,7 @@ if not getcwd().endswith('src'): exit(1) EnumPattern = compile(r'//\s*EnumUtils: DESCRIBE THIS\s+enum\s+([0-9A-Za-z]+)[^\n]*\s*{([^}]+)};') -EnumValuesPattern = compile(r'\s+[^,]+[^\n]*') +EnumValuesPattern = compile(r'\s+[^,\n]+(,[^\n]*)?') EnumValueNamePattern = compile(r'^\s*([a-zA-Z0-9_]+)', flags=MULTILINE) EnumValueSkipLinePattern = compile(r'^\s*//') EnumValueCommentPattern = compile(r'//[ \t]*([^\n]+)$') diff --git a/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp b/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp index 46ee5e23533..f43dd9c8d67 100644 --- a/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp +++ b/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp @@ -65,12 +65,14 @@ TC_API_EXPORT EnumText EnumUtils<CreatureFlagsExtra>::ToString(CreatureFlagsExtr case CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING: return { "CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING", "CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING", "creature ignore pathfinding" }; case CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK: return { "CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK", "CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK", "creature is immune to knockback effects" }; case CREATURE_FLAG_EXTRA_UNUSED_31: return { "CREATURE_FLAG_EXTRA_UNUSED_31", "CREATURE_FLAG_EXTRA_UNUSED_31", "" }; + case CREATURE_FLAG_EXTRA_UNUSED: return { "CREATURE_FLAG_EXTRA_UNUSED", "CREATURE_FLAG_EXTRA_UNUSED", "" }; + case CREATURE_FLAG_EXTRA_UNUSED_23: return { "CREATURE_FLAG_EXTRA_UNUSED_23", "CREATURE_FLAG_EXTRA_UNUSED_23", "" }; default: throw std::out_of_range("value"); } } template <> -TC_API_EXPORT size_t EnumUtils<CreatureFlagsExtra>::Count() { return 32; } +TC_API_EXPORT size_t EnumUtils<CreatureFlagsExtra>::Count() { return 34; } template <> TC_API_EXPORT CreatureFlagsExtra EnumUtils<CreatureFlagsExtra>::FromIndex(size_t index) @@ -109,6 +111,8 @@ TC_API_EXPORT CreatureFlagsExtra EnumUtils<CreatureFlagsExtra>::FromIndex(size_t case 29: return CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING; case 30: return CREATURE_FLAG_EXTRA_IMMUNITY_KNOCKBACK; case 31: return CREATURE_FLAG_EXTRA_UNUSED_31; + case 32: return CREATURE_FLAG_EXTRA_UNUSED; + case 33: return CREATURE_FLAG_EXTRA_UNUSED_23; default: throw std::out_of_range("index"); } } diff --git a/src/server/shared/enuminfo_SharedDefines.cpp b/src/server/shared/enuminfo_SharedDefines.cpp index ba0eabc0c9b..45f2ce7157f 100644 --- a/src/server/shared/enuminfo_SharedDefines.cpp +++ b/src/server/shared/enuminfo_SharedDefines.cpp @@ -42,7 +42,7 @@ TC_API_EXPORT EnumText EnumUtils<Races>::ToString(Races value) case RACE_GNOME: return { "RACE_GNOME", "Gnome", "" }; case RACE_TROLL: return { "RACE_TROLL", "Troll", "" }; case RACE_BLOODELF: return { "RACE_BLOODELF", "Blood Elf", "" }; - case RACE_DRAENEI: return { "RACE_DRAENEI", "RACE_DRAENEI", "RACE_FEL_ORC = 12," }; + case RACE_DRAENEI: return { "RACE_DRAENEI", "Draenei", "" }; default: throw std::out_of_range("value"); } } |