Add support for string enums. Add Attributes string enum.

6 files changed, 238 insertions, 0 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 09d7b0113..b7c22d413 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -918,6 +918,8 @@ SET(SRCS
     enums/being/actortype.h
     enums/being/attacktype.h
     enums/being/attributes.h
+    enums/being/attributesstrings.cpp
+    enums/being/attributesstrings.h
     enums/being/badgeindex.h
     listeners/actorspritelistener.h
     listeners/arrowslistener.cpp
@@ -1266,6 +1268,8 @@ SET(SRCS
     enums/simpletypes/showemptyrows.h
     enums/simpletypes/skiperror.h
     enums/simpletypes/speech.h
+    enums/simpletypes/stringdefines.h
+    enums/simpletypes/stringdefines2.h
     enums/simpletypes/trading.h
     enums/simpletypes/tryremovecolors.h
     enums/simpletypes/useargs.h
diff --git a/src/Makefile.am b/src/Makefile.am
index f84508526..47f553f53 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -709,6 +709,8 @@ SRC += events/actionevent.h \
 	      enums/simpletypes/showemptyrows.h \
 	      enums/simpletypes/skiperror.h \
 	      enums/simpletypes/speech.h \
+	      enums/simpletypes/stringdefines.h \
+	      enums/simpletypes/stringdefines2.h \
 	      enums/simpletypes/trading.h \
 	      enums/simpletypes/tryremovecolors.h \
 	      enums/simpletypes/useargs.h \
@@ -903,6 +905,8 @@ manaplus_SOURCES += main.cpp \
 	      enums/being/actortype.h \
 	      enums/being/attacktype.h \
 	      enums/being/attributes.h \
+	      enums/being/attributesstrings.cpp \
+	      enums/being/attributesstrings.h \
 	      enums/being/badgeindex.h \
 	      dragdrop.h \
 	      gui/shortcut/dropshortcut.cpp \
diff --git a/src/enums/being/attributesstrings.cpp b/src/enums/being/attributesstrings.cpp
new file mode 100644
index 000000000..f6f9c18d0
--- /dev/null
+++ b/src/enums/being/attributesstrings.cpp
@@ -0,0 +1,113 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "enums/being/attributesstrings.h"
+
+#include "enums/simpletypes/stringdefines.h"
+
+namespace AttributesEnum
+{
+    stringEnumStart(AttributesT)
+        // player attributes
+        strEnumDef(Attributes, PLAYER_LEVEL)
+        strEnumDef(Attributes, PLAYER_HP)
+        strEnumDef(Attributes, PLAYER_MAX_HP)
+        strEnumDef(Attributes, PLAYER_MP)
+        strEnumDef(Attributes, PLAYER_MAX_MP)
+        strEnumDef(Attributes, PLAYER_EXP)
+        strEnumDef(Attributes, PLAYER_EXP_NEEDED)
+        strEnumDef(Attributes, MONEY)
+        strEnumDef(Attributes, TOTAL_WEIGHT)
+        strEnumDef(Attributes, MAX_WEIGHT)
+        strEnumDef(Attributes, PLAYER_JOB)
+        strEnumDef(Attributes, PLAYER_STR)
+        strEnumDef(Attributes, PLAYER_AGI)
+        strEnumDef(Attributes, PLAYER_VIT)
+        strEnumDef(Attributes, PLAYER_INT)
+        strEnumDef(Attributes, PLAYER_DEX)
+        strEnumDef(Attributes, PLAYER_LUK)
+        strEnumDef(Attributes, PLAYER_SKILL_POINTS)
+        strEnumDef(Attributes, PLAYER_CHAR_POINTS)
+        strEnumDef(Attributes, PLAYER_CORR_POINTS)
+        strEnumDef(Attributes, PLAYER_ATTACK_DELAY)
+        strEnumDef(Attributes, PLAYER_ATTACK_RANGE)
+        strEnumDef(Attributes, PLAYER_WALK_SPEED)
+        strEnumDef(Attributes, PLAYER_ATTACK_SPEED)
+        strEnumDef(Attributes, PLAYER_KARMA)
+        strEnumDef(Attributes, PLAYER_MANNER)
+        strEnumDef(Attributes, PLAYER_CRIT)
+        strEnumDef(Attributes, PLAYER_FLEE)
+        strEnumDef(Attributes, PLAYER_HIT)
+        strEnumDef(Attributes, PLAYER_MDEF)
+        strEnumDef(Attributes, PLAYER_MATK)
+        strEnumDef(Attributes, PLAYER_DEF)
+        strEnumDef(Attributes, PLAYER_ATK)
+        strEnumDef(Attributes, CART_TOTAL_WEIGHT)
+        strEnumDef(Attributes, CART_MAX_WEIGHT)
+
+        // homunculus attributes
+        strEnumDef(Attributes, HOMUN_LEVEL)
+        strEnumDef(Attributes, HOMUN_HP)
+        strEnumDef(Attributes, HOMUN_MAX_HP)
+        strEnumDef(Attributes, HOMUN_MP)
+        strEnumDef(Attributes, HOMUN_MAX_MP)
+        strEnumDef(Attributes, HOMUN_EXP)
+        strEnumDef(Attributes, HOMUN_EXP_NEEDED)
+        strEnumDef(Attributes, HOMUN_SKILL_POINTS)
+        strEnumDef(Attributes, HOMUN_ATTACK_DELAY)
+        strEnumDef(Attributes, HOMUN_ATTACK_RANGE)
+        strEnumDef(Attributes, HOMUN_ATTACK_SPEED)
+        strEnumDef(Attributes, HOMUN_CRIT)
+        strEnumDef(Attributes, HOMUN_FLEE)
+        strEnumDef(Attributes, HOMUN_HIT)
+        strEnumDef(Attributes, HOMUN_MDEF)
+        strEnumDef(Attributes, HOMUN_MATK)
+        strEnumDef(Attributes, HOMUN_DEF)
+        strEnumDef(Attributes, HOMUN_ATK)
+
+        // mercenary attributes
+        strEnumDef(Attributes, MERC_LEVEL)
+        strEnumDef(Attributes, MERC_HP)
+        strEnumDef(Attributes, MERC_MAX_HP)
+        strEnumDef(Attributes, MERC_MP)
+        strEnumDef(Attributes, MERC_MAX_MP)
+        strEnumDef(Attributes, MERC_ATTACK_DELAY)
+        strEnumDef(Attributes, MERC_ATTACK_RANGE)
+        strEnumDef(Attributes, MERC_ATTACK_SPEED)
+        strEnumDef(Attributes, MERC_CRIT)
+        strEnumDef(Attributes, MERC_FLEE)
+        strEnumDef(Attributes, MERC_HIT)
+        strEnumDef(Attributes, MERC_MDEF)
+        strEnumDef(Attributes, MERC_MATK)
+        strEnumDef(Attributes, MERC_DEF)
+        strEnumDef(Attributes, MERC_ATK)
+        strEnumDef(Attributes, MERC_EXPIRE)
+        strEnumDef(Attributes, MERC_FAITH)
+        strEnumDef(Attributes, MERC_CALLS)
+        strEnumDef(Attributes, MERC_KILLS)
+
+        // elemental attributes
+        strEnumDef(Attributes, ELEMENTAL_HP)
+        strEnumDef(Attributes, ELEMENTAL_MAX_HP)
+        strEnumDef(Attributes, ELEMENTAL_MP)
+        strEnumDef(Attributes, ELEMENTAL_MAX_MP)
+    stringEnumEnd
+}
diff --git a/src/enums/being/attributesstrings.h b/src/enums/being/attributesstrings.h
new file mode 100644
index 000000000..cb082e3fd
--- /dev/null
+++ b/src/enums/being/attributesstrings.h
@@ -0,0 +1,34 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2010  The Mana Developers
+ *  Copyright (C) 2011-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_BEING_ATTRIBUTESSTRINGS_H
+#define ENUMS_BEING_ATTRIBUTESSTRINGS_H
+
+#include "enums/being/attributes.h"
+
+#include "enums/simpletypes/stringdefines2.h"
+
+namespace AttributesEnum
+{
+    stringEnumDef(AttributesT)
+}
+
+#endif  // ENUMS_BEING_ATTRIBUTESSTRINGS_H
diff --git a/src/enums/simpletypes/stringdefines.h b/src/enums/simpletypes/stringdefines.h
new file mode 100644
index 000000000..bebee5785
--- /dev/null
+++ b/src/enums/simpletypes/stringdefines.h
@@ -0,0 +1,50 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2015-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_SIMPLETYPES_STRINGDEFINES_H
+#define ENUMS_SIMPLETYPES_STRINGDEFINES_H
+
+#include <map>
+#include <string>
+
+#include "localconsts.h"
+
+#define stringEnumStart(type) \
+    std::map<std::string, type> mStringsArray; \
+    bool find(const std::string &key) \
+    { \
+        return mStringsArray.find(key) != mStringsArray.end(); \
+    } \
+    type get(const std::string &key) \
+    { \
+        return mStringsArray[key]; \
+    } \
+    void init() \
+    { \
+        mStringsArray.clear();
+
+#define strEnumDef(prefix, name) \
+        mStringsArray[#name] = prefix::name; \
+
+#define stringEnumEnd \
+    }
+
+
+#endif  // ENUMS_SIMPLETYPES_STRINGDEFINES_H
diff --git a/src/enums/simpletypes/stringdefines2.h b/src/enums/simpletypes/stringdefines2.h
new file mode 100644
index 000000000..4489bc469
--- /dev/null
+++ b/src/enums/simpletypes/stringdefines2.h
@@ -0,0 +1,33 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2015-2016  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_SIMPLETYPES_STRINGDEFINES2_H
+#define ENUMS_SIMPLETYPES_STRINGDEFINES2_H
+
+#include <string>
+
+#include "localconsts.h"
+
+#define stringEnumDef(type) \
+    bool find(const std::string &key); \
+    type get(const std::string &key); \
+    void init();
+
+#endif  // ENUMS_SIMPLETYPES_STRINGDEFINES2_H