diff options
| -rw-r--r-- | contrib/enumutils_describe.py | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Creature/enuminfo_CreatureData.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/SharedDefines.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/contrib/enumutils_describe.py b/contrib/enumutils_describe.py index 29380e818f0..84f01495864 100644 --- a/contrib/enumutils_describe.py +++ b/contrib/enumutils_describe.py @@ -27,10 +27,10 @@ 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]+(,[^\n]*)?') +EnumValuesPattern = compile(r'\s+.+?(,|$)[^\n]*') EnumValueNamePattern = compile(r'^\s*([a-zA-Z0-9_]+)', flags=MULTILINE) EnumValueSkipLinePattern = compile(r'^\s*//') -EnumValueCommentPattern = compile(r'//[ \t]*([^\n]+)$') +EnumValueCommentPattern = compile(r'//,?[ \t]*([^\n]+)$') CommentMatchFormat = compile(r'^(((TITLE +(.+?))|(DESCRIPTION +(.+?))) *){1,2}$') CommentSkipFormat = compile(r'^SKIP *$') diff --git a/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp b/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp index f43dd9c8d67..46ee5e23533 100644 --- a/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp +++ b/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp @@ -65,14 +65,12 @@ 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 34; } +TC_API_EXPORT size_t EnumUtils<CreatureFlagsExtra>::Count() { return 32; } template <> TC_API_EXPORT CreatureFlagsExtra EnumUtils<CreatureFlagsExtra>::FromIndex(size_t index) @@ -111,8 +109,6 @@ 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/SharedDefines.h b/src/server/shared/SharedDefines.h index 621d23df83a..d49d28b3681 100644 --- a/src/server/shared/SharedDefines.h +++ b/src/server/shared/SharedDefines.h @@ -93,7 +93,7 @@ enum Races RACE_TROLL = 8, // TITLE Troll //RACE_GOBLIN = 9, RACE_BLOODELF = 10, // TITLE Blood Elf - RACE_DRAENEI = 11 // TITLE Draenei + RACE_DRAENEI = 11 //, TITLE Draenei //RACE_FEL_ORC = 12, //RACE_NAGA = 13, //RACE_BROKEN = 14, |