From f70dcfe0a82db3aee879953f117d12aecc4fce85 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 27 Sep 2017 23:13:28 +0300 Subject: Rename Attributes::PLAYER_JOB to Attributes::PLAYER_JOB_LEVEL. --- src/enums/being/attributes.h | 2 +- src/enums/being/attributesstrings.cpp | 2 +- src/enums/simpletypes/stringdefines.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/enums') diff --git a/src/enums/being/attributes.h b/src/enums/being/attributes.h index 7cda13284..bb9432137 100644 --- a/src/enums/being/attributes.h +++ b/src/enums/being/attributes.h @@ -37,7 +37,7 @@ enumStart(Attributes) MONEY, TOTAL_WEIGHT, MAX_WEIGHT, - PLAYER_JOB = 10, + PLAYER_JOB_LEVEL = 10, PLAYER_STR = 13, PLAYER_AGI = 14, PLAYER_VIT = 15, diff --git a/src/enums/being/attributesstrings.cpp b/src/enums/being/attributesstrings.cpp index 6dd24eef9..b9cd6659a 100644 --- a/src/enums/being/attributesstrings.cpp +++ b/src/enums/being/attributesstrings.cpp @@ -41,7 +41,7 @@ namespace AttributesEnum strEnumDef(Attributes, MONEY) strEnumDef(Attributes, TOTAL_WEIGHT) strEnumDef(Attributes, MAX_WEIGHT) - strEnumDef(Attributes, PLAYER_JOB) + strEnumDef2(Attributes, PLAYER_JOB_LEVEL, "PLAYER_JOB") strEnumDef(Attributes, PLAYER_JOB_EXP) strEnumDef(Attributes, PLAYER_JOB_EXP_NEEDED) strEnumDef(Attributes, PLAYER_STR) diff --git a/src/enums/simpletypes/stringdefines.h b/src/enums/simpletypes/stringdefines.h index 3d3dc273a..6cdebf7c0 100644 --- a/src/enums/simpletypes/stringdefines.h +++ b/src/enums/simpletypes/stringdefines.h @@ -41,7 +41,8 @@ mStringsArray[#name] = prefix::name; \ #define strEnumDef2(prefix, name, str) \ - mStringsArray[str] = prefix::name; \ + mStringsArray[#name] = prefix::name; \ + mStringsArray[str] = prefix::name; #define stringEnumEnd \ } -- cgit v1.2.3-60-g2f50