summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-08 13:17:51 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-08 13:17:51 +0000
commitbd192d6c4cab110917af490392c4d267452bb0b1 (patch)
treef172db2b56047bb08d37653b7dea52a150343af1 /src/map
parenteb5205ba5ba276ef8fb3487517085f363d5c84bb (diff)
downloadhercules-bd192d6c4cab110917af490392c4d267452bb0b1.tar.gz
hercules-bd192d6c4cab110917af490392c4d267452bb0b1.tar.bz2
hercules-bd192d6c4cab110917af490392c4d267452bb0b1.tar.xz
hercules-bd192d6c4cab110917af490392c4d267452bb0b1.zip
Implemented the two-handed staff/rod type (thanks to Muad_Dib).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12793 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/pc.h1
-rw-r--r--src/map/skill.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/map/pc.h b/src/map/pc.h
index 0991d5150..53218c033 100644
--- a/src/map/pc.h
+++ b/src/map/pc.h
@@ -392,6 +392,7 @@ enum weapon_type {
W_SHOTGUN, //20
W_GRENADE, //21
W_HUUMA, //22
+ W_2HSTAFF, //23
MAX_WEAPON_TYPE,
// dual-wield constants
W_DOUBLE_DD, // 2 daggers
diff --git a/src/map/skill.c b/src/map/skill.c
index 7559c8177..11a362dd2 100644
--- a/src/map/skill.c
+++ b/src/map/skill.c
@@ -1133,6 +1133,7 @@ int skill_break_equip (struct block_list *bl, unsigned short where, int rate, in
case W_MACE: // Axes and Maces can't be broken [DracoRPG]
case W_2HMACE:
case W_STAFF:
+ case W_2HSTAFF:
case W_BOOK: //Rods and Books can't be broken [Skotlex]
case W_HUUMA:
where &= ~EQP_WEAPON;