summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/pc.c5
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) {