From: <rav...@us...> - 2016-12-01 23:24:11
|
Revision: 9964 http://sourceforge.net/p/planeshift/code/9964 Author: ravna-ps Date: 2016-12-01 23:24:09 +0000 (Thu, 01 Dec 2016) Log Message: ----------- Fixed: You can no longer equip a 2h weapon in one hand if your other hand is already holding an item. Modified Paths: -------------- trunk/src/server/bulkobjects/pscharinventory.cpp Modified: trunk/src/server/bulkobjects/pscharinventory.cpp =================================================================== --- trunk/src/server/bulkobjects/pscharinventory.cpp 2016-11-23 16:23:49 UTC (rev 9963) +++ trunk/src/server/bulkobjects/pscharinventory.cpp 2016-12-01 23:24:09 UTC (rev 9964) @@ -545,7 +545,7 @@ INVENTORY_SLOT_NUMBER otherSlot = proposedSlot == PSCHARACTER_SLOT_RIGHTHAND ? PSCHARACTER_SLOT_LEFTHAND : PSCHARACTER_SLOT_RIGHTHAND; - if(proposedSlot == PSCHARACTER_SLOT_BOTHHANDS) + if(item->FitsInSlot(PSCHARACTER_SLOT_BOTHHANDS)) { psItem *other = GetInventoryItem(otherSlot); if(other && other != item) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |