[crossfire] [Crossfire-cvs] CVS commit: crossfire

[Andreas Kirschbaum]

Crossfire CVS repository messages. wrote:
> Module Name:    crossfire
> Committed By:   ryo_saeba
> Date:           Sat Jun 24 10:41:44 UTC 2006
>
> Modified Files:
>         crossfire: ChangeLog
>         crossfire/common: object.c
>
> Log Message:
> Fix merging bug.
[...]
> + common/object.c: don't consider FLAG_INV_LOCKED for can_merge.

This definitely is not a "bug" but a feature (see my previous ChangeLog
entry "Do not merge locked and unlocked items." from 2006-06-01).

In fact, we (mwedel, gros and me IIRC) did agree (on IRC) that locked
items should not merge. The reason is that a player normally locks the
gear he regularly uses. This includes items
(rings/armour/weapons/cloaks/etc.) which are only temporarily
worn/wielded.

The previous (and now again active) behavior makes the character
accumulate locked items. If you do not always watch your items, you end
with multiple copies of locked items in your inventory. This normally is
not intended since it adds useless weight to your character. (This
argument maybe does not hold that much for dragon players for their lack
of usable items, but my human character(s) usually have more than 50(!)
locked items in inventory. Thus it is virtually impossible to notice
such unintentionally merged items.)