| version 1.633 | | version 1.634 |
|---|
| | |
| ------------------------------------------------------------------------------ | | ------------------------------------------------------------------------------ |
| Changes for CVS: | | Changes for CVS: |
| | | |
| | | common/object.c: don't consider FLAG_INV_LOCKED for can_merge. |
| | | Ryo 2006-06-24 |
| | | |
| common/object.c: in insert_ob_in_map() don't stop processing flying objects | | common/object.c: in insert_ob_in_map() don't stop processing flying objects |
| if the object also has floor set. This fixes crashes when an object | | if the object also has floor set. This fixes crashes when an object |
| is both flying and has floor set. | | is both flying and has floor set. |