Skip to content

Commit 7391d7d

Browse files
authored
Equipped armor / weapon will also drop on ground when moving it while overweight (#1604) (#1606)
1 parent d89374a commit 7391d7d

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎Changelog.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4151,3 +4151,6 @@ When setting a property like MORE to the a spell or skill defname, trying to rea
41514151

41524152
03-10-2026, yeiffet
41534153
- Fixed: "vector too long" exception in CWorldTicker, which made some characters stop ticking, so they couldn't die (#1593).
4154+
4155+
08-10-2026, Mulambo
4156+
- Changed: Equipped armor / weapon will also drop on ground when moving it while overweight, like other items (unless OF_OWNoDropCarriedItem is enabled).

‎src/game/chars/CCharAct.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3126,7 +3126,8 @@ bool CChar::ItemBounce( CItem * pItem, bool fDisplayMsg )
31263126
}
31273127
}
31283128
}
3129-
else if ( pItem->GetEquipLayer() > LAYER_NONE && pItem->GetEquipLayer() <= LAYER_LEGS) //If we are overweight, we don't want our equipped items to fall on the ground. They will remain equipped.
3129+
// Item is equipped (armor / weapon), char is overweight and optional flag OWNoDropCarriedItem is enabled, so we keep it equipped.
3130+
else if (pItem->GetEquipLayer() > LAYER_NONE && pItem->GetEquipLayer() <= LAYER_LEGS && IsSetOF(OF_OWNoDropCarriedItem))
31303131
{
31313132
SysMessageDefault(DEFMSG_MSG_HEAVY);
31323133
return false;

0 commit comments

Comments
 (0)