summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2014-10-13 13:19:43 -0700
committerBen Longbons <b.r.longbons@gmail.com>2014-10-13 13:19:43 -0700
commit0d9f2d217265e826a4843b3873824216344f1b24 (patch)
treea007eea2762c956765cade68f29fd5ab4772d843 /src
parenta881d6e0e7c4e51ad199c1f1f14b6c574c25686b (diff)
downloadtmwa-0d9f2d217265e826a4843b3873824216344f1b24.tar.gz
tmwa-0d9f2d217265e826a4843b3873824216344f1b24.tar.bz2
tmwa-0d9f2d217265e826a4843b3873824216344f1b24.tar.xz
tmwa-0d9f2d217265e826a4843b3873824216344f1b24.zip
Restore missing check to let double-handed weapons work
Diffstat (limited to 'src')
-rw-r--r--src/map/pc.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/map/pc.cpp b/src/map/pc.cpp
index ac78672..3c0fce5 100644
--- a/src/map/pc.cpp
+++ b/src/map/pc.cpp
@@ -4405,7 +4405,9 @@ int pc_equipitem(dumb_ptr<map_session_data> sd, IOff0 n, EPOS)
{
if (sd->inventory_data[n]->type == ItemType::WEAPON)
{
- assert(0 && "unreachable - offhand weapons are not supported");
+ sd->status.shield = ItemNameId();
+ if (sd->status.inventory[n].equip == EPOS::SHIELD)
+ assert(0 && "unreachable - offhand weapons are not supported");
}
else if (sd->inventory_data[n]->type == ItemType::ARMOR)
{