summaryrefslogtreecommitdiff
path: root/src/map/pc.h
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-03-17 15:15:16 +0100
committerHaru <haru@dotalux.com>2016-03-17 15:15:16 +0100
commit7117106f873e954e820a4be3ed3b8687e96fd1fe (patch)
treee7e8718a41e4029e362ae6424b1e75d713dd760a /src/map/pc.h
parent3cecbe83ddf16d2884706a3a77f24a0228b794bd (diff)
parent327f9679f0f47bca96af2ef870ac5851bd6293ab (diff)
downloadhercules-7117106f873e954e820a4be3ed3b8687e96fd1fe.tar.gz
hercules-7117106f873e954e820a4be3ed3b8687e96fd1fe.tar.bz2
hercules-7117106f873e954e820a4be3ed3b8687e96fd1fe.tar.xz
hercules-7117106f873e954e820a4be3ed3b8687e96fd1fe.zip
Merge pull request #1202 from Kolkka/master
Fixes #1198 and fixes #1194 introduced in pull request #1189
Diffstat (limited to 'src/map/pc.h')
-rw-r--r--src/map/pc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index 0d2bca84d..5c5ec131d 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -657,7 +657,7 @@ END_ZEROED_BLOCK;
#define pc_stop_attack(sd) (unit->stop_attack(&(sd)->bl))
//Weapon check considering dual wielding.
-#define pc_check_weapontype(sd, type) ((type)&((sd)->status.weapon < MAX_WEAPON_TYPE? \
+#define pc_check_weapontype(sd, type) ((type)&((sd)->status.weapon < MAX_SINGLE_WEAPON_TYPE? \
1<<(sd)->status.weapon:(1<<(sd)->weapontype1)|(1<<(sd)->weapontype2)|(1<<(sd)->status.weapon)))
// clientside display macros (values to the left/right of the "+")