From 16f6f636aee6acaf52439643502f5ff9cb4ccffc Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 1 Jun 2015 01:08:30 +0300
Subject: Convert UserColorId enum into strong typed enum.

---
 src/enums/gui/usercolorid.h | 102 ++++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 51 deletions(-)

(limited to 'src/enums')

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
-- 
cgit v1.2.3-70-g09d2