summaryrefslogtreecommitdiff
path: root/src/common/mmo.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-11-29 01:49:47 +0100
committerHaru <haru@dotalux.com>2016-12-03 15:38:54 +0100
commitb0fde17b0ee155f1123e9ae6148ddd2df88cd965 (patch)
tree30d81c6f461c6be4134c4a0f23952802e72eff3d /src/common/mmo.h
parent9ac2545d66e630cce6a718a7c6f374fbecb00e96 (diff)
downloadhercules-b0fde17b0ee155f1123e9ae6148ddd2df88cd965.tar.gz
hercules-b0fde17b0ee155f1123e9ae6148ddd2df88cd965.tar.bz2
hercules-b0fde17b0ee155f1123e9ae6148ddd2df88cd965.tar.xz
hercules-b0fde17b0ee155f1123e9ae6148ddd2df88cd965.zip
Clarify the meaning of the MAPID_* constants
The enum values are now written in a more explicit way, showing how they're composed (upper mask + base job). A future-proof static assertion is added, to make sure the base jobs won't overlap the upper masks. Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/common/mmo.h')
-rw-r--r--src/common/mmo.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 93151d3ca..e5da16550 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -259,12 +259,12 @@
// The following system marks a different job ID system used by the map server,
// which makes a lot more sense than the normal one. [Skotlex]
// These marks the "level" of the job.
-#define JOBL_2_1 0x100 //256
-#define JOBL_2_2 0x200 //512
-#define JOBL_2 0x300
-#define JOBL_UPPER 0x1000 //4096
-#define JOBL_BABY 0x2000 //8192
-#define JOBL_THIRD 0x4000 //16384
+#define JOBL_2_1 0x0100
+#define JOBL_2_2 0x0200
+#define JOBL_2 0x0300 // JOBL_2_1 | JOBL_2_2
+#define JOBL_UPPER 0x1000
+#define JOBL_BABY 0x2000
+#define JOBL_THIRD 0x4000
#define SCRIPT_VARNAME_LENGTH 32 ///< Maximum length of a script variable