| version 1.634 | | version 1.635 |
|---|
| | |
| ------------------------------------------------------------------------------ | | ------------------------------------------------------------------------------ |
| Changes for CVS: | | Changes for CVS: |
| | | |
| | | server/rune.c: Patch from schmorp - when dealing with traps, don't put them |
| | | underneath the player when a disarm failure happens, instead, update the |
| | | direction to hit the player - prevents a recursion problems causing |
| | | hundreds of objects. |
| | | MSW 2006-06-25 |
| | | |
| common/object.c: don't consider FLAG_INV_LOCKED for can_merge. | | common/object.c: don't consider FLAG_INV_LOCKED for can_merge. |
| Ryo 2006-06-24 | | Ryo 2006-06-24 |
| | | |