diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-26 03:36:14 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-12-26 03:36:14 +0000 |
| commit | aacf1a365aced0d8aff2717330a5e72141a5b8b1 (patch) | |
| tree | 29b4d4d4db4c0921ba7f0bdfee64e30274ae1da4 | |
| parent | 81aee595533a171d8b8ba72b17971ec5905cce15 (diff) | |
| download | hercules-aacf1a365aced0d8aff2717330a5e72141a5b8b1.tar.gz hercules-aacf1a365aced0d8aff2717330a5e72141a5b8b1.tar.bz2 hercules-aacf1a365aced0d8aff2717330a5e72141a5b8b1.tar.xz hercules-aacf1a365aced0d8aff2717330a5e72141a5b8b1.zip | |
* Fixed two-hand weapons not getting recognized as such upon equipping, causing respective one-hand weapon's base ASPD values being used instead (bugreport:4659, related r12599).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14624 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog-Trunk.txt | 1 | ||||
| -rw-r--r-- | src/map/pc.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 0078a63e7..e0b48c3c8 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -1,6 +1,7 @@ Date Added 2010/12/25 + * Fixed two-hand weapons not getting recognized as such upon equipping, causing respective one-hand weapon's base ASPD values being used instead (bugreport:4659, related r12599). [Ai4rei] * Updated script commands delitem and delitem2. [Ai4rei] - Items are now deleted only if there is enough of them (as per r14395, related r13368). - Not equipped items are now actually prioritized over equipped ones (related r200). diff --git a/src/map/pc.c b/src/map/pc.c index b22a365e0..45330f343 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -7125,10 +7125,7 @@ int pc_equipitem(struct map_session_data *sd,int n,int req_pos) if(id) { if(id->type == IT_WEAPON) { sd->status.shield = 0; - if(sd->status.inventory[n].equip == EQP_HAND_L) - sd->weapontype2 = id->look; - else - sd->weapontype2 = 0; + sd->weapontype2 = id->look; } else if(id->type == IT_ARMOR) { |