From 64d30eda264c342aced8d791b47a35def0e4d15c Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Sep 2017 20:27:11 +0300 Subject: Rename Attributes::PLAYER_LEVEL to Attributes::PLAYER_BASE_LEVEL. --- src/enums/being/attributes.h | 2 +- src/enums/being/attributesstrings.cpp | 2 +- src/enums/simpletypes/stringdefines.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'src/enums') diff --git a/src/enums/being/attributes.h b/src/enums/being/attributes.h index c98413c69..7252a539a 100644 --- a/src/enums/being/attributes.h +++ b/src/enums/being/attributes.h @@ -27,7 +27,7 @@ enumStart(Attributes) { // player attributes - PLAYER_LEVEL = 0, + PLAYER_BASE_LEVEL = 0, PLAYER_HP, PLAYER_MAX_HP, PLAYER_MP, diff --git a/src/enums/being/attributesstrings.cpp b/src/enums/being/attributesstrings.cpp index 4d75d54a4..51c116355 100644 --- a/src/enums/being/attributesstrings.cpp +++ b/src/enums/being/attributesstrings.cpp @@ -31,7 +31,7 @@ namespace AttributesEnum { stringEnumStart(AttributesT) // player attributes - strEnumDef(Attributes, PLAYER_LEVEL) + strEnumDef2(Attributes, PLAYER_BASE_LEVEL, "PLAYER_LEVEL") strEnumDef(Attributes, PLAYER_HP) strEnumDef(Attributes, PLAYER_MAX_HP) strEnumDef(Attributes, PLAYER_MP) diff --git a/src/enums/simpletypes/stringdefines.h b/src/enums/simpletypes/stringdefines.h index 67631aa8a..3d3dc273a 100644 --- a/src/enums/simpletypes/stringdefines.h +++ b/src/enums/simpletypes/stringdefines.h @@ -40,6 +40,9 @@ #define strEnumDef(prefix, name) \ mStringsArray[#name] = prefix::name; \ +#define strEnumDef2(prefix, name, str) \ + mStringsArray[str] = prefix::name; \ + #define stringEnumEnd \ } -- cgit v1.2.3-70-g09d2