summaryrefslogtreecommitdiff
path: root/src/enums
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-29 16:19:21 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-29 16:19:21 +0300
commit7bdb50605562e47f1d6ae134881c09bd42293be5 (patch)
tree935228722e4eb48f5856abec53be1ec985a0b9d6 /src/enums
parent0f9ec2061c4ad6157c3186f1cab9c4d8558980b5 (diff)
downloadmv-7bdb50605562e47f1d6ae134881c09bd42293be5.tar.gz
mv-7bdb50605562e47f1d6ae134881c09bd42293be5.tar.bz2
mv-7bdb50605562e47f1d6ae134881c09bd42293be5.tar.xz
mv-7bdb50605562e47f1d6ae134881c09bd42293be5.zip
Add strong typed int type BeingTypeId.
Diffstat (limited to 'src/enums')
-rw-r--r--src/enums/simpletypes/beingid.h7
-rw-r--r--src/enums/simpletypes/beingtypeid.h29
-rw-r--r--src/enums/simpletypes/intdefines.h2
3 files changed, 32 insertions, 6 deletions
diff --git a/src/enums/simpletypes/beingid.h b/src/enums/simpletypes/beingid.h
index dddd83932..ffc9eb6f6 100644
--- a/src/enums/simpletypes/beingid.h
+++ b/src/enums/simpletypes/beingid.h
@@ -24,11 +24,6 @@
#include "enums/simpletypes/intdefines.h"
defIntEnum(BeingId, int);
-
-#ifdef ADVGCC
-const BeingId BeingId_negOne = static_cast<BeingId>(-1);
-#else
-const BeingId BeingId_negOne = -1;
-#endif
+defIntEnumNeg(BeingId);
#endif // ENUMS_SIMPLETYPES_BEINGID_H
diff --git a/src/enums/simpletypes/beingtypeid.h b/src/enums/simpletypes/beingtypeid.h
new file mode 100644
index 000000000..a36e7058b
--- /dev/null
+++ b/src/enums/simpletypes/beingtypeid.h
@@ -0,0 +1,29 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2015 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_BEINGTYPEID_H
+#define ENUMS_SIMPLETYPES_BEINGTYPEID_H
+
+#include "enums/simpletypes/intdefines.h"
+
+defIntEnum(BeingTypeId, int);
+defIntEnumNeg(BeingTypeId);
+
+#endif // ENUMS_SIMPLETYPES_BEINGTYPEID_H
diff --git a/src/enums/simpletypes/intdefines.h b/src/enums/simpletypes/intdefines.h
index 765318cdc..984e9d411 100644
--- a/src/enums/simpletypes/intdefines.h
+++ b/src/enums/simpletypes/intdefines.h
@@ -33,6 +33,7 @@
#define fromInt(val, name) static_cast<name>(val)
#define toInt(val, name) static_cast<name>(val)
+#define defIntEnumNeg(name) const name name##_negOne = static_cast<name>(-1)
#else // ADVGCC
@@ -41,6 +42,7 @@
const name name##_zero = 0
#define fromInt(val, name) (val)
#define toInt(val, name) (val)
+#define defIntEnumNeg(name) const name name##_negOne = -1
#endif // ADVGCC