summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-15 05:14:29 +0000
committerai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-05-15 05:14:29 +0000
commit760e1baa46db64db570a6f77f252834d0ce605b3 (patch)
tree6e8f1ac70a0d4f55774207645ced3a1d9d483a79 /src
parent0f68ad394abe13e2374f84f02ac1b04e62fe406e (diff)
downloadhercules-760e1baa46db64db570a6f77f252834d0ce605b3.tar.gz
hercules-760e1baa46db64db570a6f77f252834d0ce605b3.tar.bz2
hercules-760e1baa46db64db570a6f77f252834d0ce605b3.tar.xz
hercules-760e1baa46db64db570a6f77f252834d0ce605b3.zip
* Merged pcdb_checkid update from renewal [14810/branches/renewal].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14820 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/pc.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index 191c51eb6..1d0a59391 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -549,7 +549,11 @@ enum equip_index {
#define pc_check_weapontype(sd, type) ((type)&((sd)->status.weapon < MAX_WEAPON_TYPE? \
1<<(sd)->status.weapon:(1<<(sd)->weapontype1)|(1<<(sd)->weapontype2)))
//Checks if the given class value corresponds to a player class. [Skotlex]
-#define pcdb_checkid(class_) (class_ < JOB_MAX_BASIC || (class_ >= JOB_NOVICE_HIGH && class_ < JOB_MAX))
+#define pcdb_checkid(class_) \
+( \
+ ( (class_) >= JOB_NOVICE && (class_) < JOB_MAX_BASIC ) \
+|| ( (class_) >= JOB_NOVICE_HIGH && (class_) < JOB_MAX ) \
+)
int pc_class2idx(int class_);
int pc_isGM(struct map_session_data *sd);