Jump to content

[fix][7326] don't equip ammo_pouch and quiver at the same time

Guest balrok

Recommended Posts

for which revision:


what does it fix:

currently it's possible to equip an ammo_pouch together with a quiver...

this increases speed of the bow/gun and i think this shouldn't be possible

author: balrok

this is untested yet, but if there exists no weird subclasses, i think this should be ok, cause i only removed the subclass check..

diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 4da09e2..3bb2823 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -9928,8 +9928,7 @@ uint8 Player::CanEquipItem( uint8 slot, uint16 &dest, Item *pItem, bool swap, bo
                        if( ItemPrototype const* pBagProto = pBag->GetProto() )
-                            if( pBagProto->Class==pProto->Class && pBagProto->SubClass==pProto->SubClass &&
-                                (!swap || pBag->GetSlot() != eslot ) )
+                            if( pBagProto->Class==pProto->Class && (!swap || pBag->GetSlot() != eslot ) )
                                if(pBagProto->SubClass == ITEM_SUBCLASS_AMMO_POUCH)
                                    return EQUIP_ERR_CAN_EQUIP_ONLY1_AMMOPOUCH;

Link to comment
Share on other sites

  • Create New...

Important Information

We have placed cookies on your device to help make this website better. You can adjust your cookie settings, otherwise we'll assume you're okay to continue. Privacy Policy Terms of Use