mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10574] Fixed non-weapon offhand equip after my recent commit.

Browse source
This commit is contained in:
VladimirMangos 2010-10-02 06:28:01 +04:00
parent 321b8a4ae8
commit fa8f9ad522
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/Player.cpp
View file

@ -20144,7 +20144,8 @@ void Player::AutoUnequipOffhandIfNeed()
return; return;
// need unequip offhand for 2h-weapon without TitanGrip (in any from hands) // need unequip offhand for 2h-weapon without TitanGrip (in any from hands)
if (CanDualWield() && (CanTitanGrip() || (offItem->GetProto()->InventoryType != INVTYPE_2HWEAPON && !IsTwoHandUsed()))) if ((CanDualWield() || offItem->GetProto()->InventoryType == INVTYPE_SHIELD || offItem->GetProto()->InventoryType == INVTYPE_HOLDABLE) &&
(CanTitanGrip() || (offItem->GetProto()->InventoryType != INVTYPE_2HWEAPON && !IsTwoHandUsed())))
return; return;
ItemPosCountVec off_dest; ItemPosCountVec off_dest;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "10573" #define REVISION_NR "10574"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__