summaryrefslogtreecommitdiff
path: root/src/enums
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-27 23:13:28 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-27 23:13:28 +0300
commitf70dcfe0a82db3aee879953f117d12aecc4fce85 (patch)
tree0e0e4deac4c18ff478bdc42aba4ee3c834ae1390 /src/enums
parent9429dc4f5b5b6102a8b575de25ce5d8e7170551f (diff)
downloadplus-f70dcfe0a82db3aee879953f117d12aecc4fce85.tar.gz
plus-f70dcfe0a82db3aee879953f117d12aecc4fce85.tar.bz2
plus-f70dcfe0a82db3aee879953f117d12aecc4fce85.tar.xz
plus-f70dcfe0a82db3aee879953f117d12aecc4fce85.zip
Rename Attributes::PLAYER_JOB to Attributes::PLAYER_JOB_LEVEL.
Diffstat (limited to 'src/enums')
-rw-r--r--src/enums/being/attributes.h2
-rw-r--r--src/enums/being/attributesstrings.cpp2
-rw-r--r--src/enums/simpletypes/stringdefines.h3
3 files changed, 4 insertions, 3 deletions
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 \
}