diff options
| -rw-r--r-- | Changelog-Trunk.txt | 2 | ||||
| -rw-r--r-- | src/map/pc.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index c0dbefd1e..703146a66 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,5 +1,7 @@ Date Added +2011/05/15 + * Merged pcdb_checkid update from renewal [14810/branches/renewal]. [Ai4rei] 2011/05/14 * Moved bitfield 'boss' inside 'spawn_data' and 'mob_data' into the respective state struct (from r13813, follow up to r14795). [Ai4rei] * Some NPC event related cleaning. [Ai4rei] 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); |