summaryrefslogtreecommitdiff
path: root/src/enums/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-06-01 01:08:30 +0300
committerAndrei Karas <akaras@inbox.ru>2015-06-01 01:08:30 +0300
commit16f6f636aee6acaf52439643502f5ff9cb4ccffc (patch)
tree9f291e5257e20b0090405d4594553f38a69767ce /src/enums/gui
parent3fc7fd8473e545265c705504ee0d5f2a70268282 (diff)
downloadmv-16f6f636aee6acaf52439643502f5ff9cb4ccffc.tar.gz
mv-16f6f636aee6acaf52439643502f5ff9cb4ccffc.tar.bz2
mv-16f6f636aee6acaf52439643502f5ff9cb4ccffc.tar.xz
mv-16f6f636aee6acaf52439643502f5ff9cb4ccffc.zip
Convert UserColorId enum into strong typed enum.
Diffstat (limited to 'src/enums/gui')
-rw-r--r--src/enums/gui/usercolorid.h102
1 files changed, 51 insertions, 51 deletions
diff --git a/src/enums/gui/usercolorid.h b/src/enums/gui/usercolorid.h
index 0a66cf6b9..5087c36f8 100644
--- a/src/enums/gui/usercolorid.h
+++ b/src/enums/gui/usercolorid.h
@@ -24,57 +24,57 @@
#ifndef ENUMS_GUI_USERCOLORID_H
#define ENUMS_GUI_USERCOLORID_H
-namespace UserColorId
+#include "enums/simpletypes/enumdefines.h"
+
+enumStart(UserColorId)
{
- /** List of all colors that are configurable. */
- enum T
- {
- BEING = 0,
- FRIEND,
- DISREGARDED,
- IGNORED,
- ERASED,
- PC,
- SELF,
- GM,
- NPC,
- MONSTER,
- MONSTER_HP,
- MONSTER_HP2,
- PARTY,
- GUILD,
- PARTICLE,
- PICKUP_INFO,
- EXP_INFO,
- PLAYER_HP,
- PLAYER_HP2,
- HIT_PLAYER_MONSTER,
- HIT_MONSTER_PLAYER,
- HIT_PLAYER_PLAYER,
- HIT_CRITICAL,
- HIT_LOCAL_PLAYER_MONSTER,
- HIT_LOCAL_PLAYER_CRITICAL,
- HIT_LOCAL_PLAYER_MISS,
- MISS,
- PORTAL_HIGHLIGHT,
- COLLISION_HIGHLIGHT,
- AIR_COLLISION_HIGHLIGHT,
- WATER_COLLISION_HIGHLIGHT,
- GROUNDTOP_COLLISION_HIGHLIGHT,
- WALKABLE_HIGHLIGHT,
- ATTACK_RANGE,
- ATTACK_RANGE_BORDER,
- MONSTER_ATTACK_RANGE,
- FLOOR_ITEM_TEXT,
- HOME_PLACE,
- HOME_PLACE_BORDER,
- ROAD_POINT,
- NET,
- PET,
- MERCENARY,
- HOMUNCULUS,
- USER_COLOR_LAST
- };
-} // namespace UserColorId
+ NO_COLOR = -1,
+ BEING = 0,
+ FRIEND,
+ DISREGARDED,
+ IGNORED,
+ ERASED,
+ PC,
+ SELF,
+ GM,
+ NPC,
+ MONSTER,
+ MONSTER_HP,
+ MONSTER_HP2,
+ PARTY,
+ GUILD,
+ PARTICLE,
+ PICKUP_INFO,
+ EXP_INFO,
+ PLAYER_HP,
+ PLAYER_HP2,
+ HIT_PLAYER_MONSTER,
+ HIT_MONSTER_PLAYER,
+ HIT_PLAYER_PLAYER,
+ HIT_CRITICAL,
+ HIT_LOCAL_PLAYER_MONSTER,
+ HIT_LOCAL_PLAYER_CRITICAL,
+ HIT_LOCAL_PLAYER_MISS,
+ MISS,
+ PORTAL_HIGHLIGHT,
+ COLLISION_HIGHLIGHT,
+ AIR_COLLISION_HIGHLIGHT,
+ WATER_COLLISION_HIGHLIGHT,
+ GROUNDTOP_COLLISION_HIGHLIGHT,
+ WALKABLE_HIGHLIGHT,
+ ATTACK_RANGE,
+ ATTACK_RANGE_BORDER,
+ MONSTER_ATTACK_RANGE,
+ FLOOR_ITEM_TEXT,
+ HOME_PLACE,
+ HOME_PLACE_BORDER,
+ ROAD_POINT,
+ NET,
+ PET,
+ MERCENARY,
+ HOMUNCULUS,
+ USER_COLOR_LAST
+}
+enumEnd(UserColorId);
#endif // ENUMS_GUI_USERCOLORID_H