| … | |
… | |
| 299 | return 0; |
299 | return 0; |
| 300 | else if (!compare_ob_value_lists (ob1, ob2)) |
300 | else if (!compare_ob_value_lists (ob1, ob2)) |
| 301 | return 0; |
301 | return 0; |
| 302 | } |
302 | } |
| 303 | |
303 | |
| 304 | //TODO: generate an event or call into perl for additional checks |
|
|
| 305 | if (ob1->self || ob2->self) |
304 | if (ob1->self || ob2->self) |
| 306 | { |
305 | { |
| 307 | ob1->optimise (); |
306 | ob1->optimise (); |
| 308 | ob2->optimise (); |
307 | ob2->optimise (); |
| 309 | |
308 | |
| 310 | if (ob1->self || ob2->self) |
309 | if (ob1->self || ob2->self) |
|
|
310 | if (!cfperl_can_merge (ob1, ob2)) |
| 311 | return 0; |
311 | return 0; |
| 312 | } |
312 | } |
| 313 | |
313 | |
| 314 | /* Everything passes, must be OK. */ |
314 | /* Everything passes, must be OK. */ |
| 315 | return 1; |
315 | return 1; |
| 316 | } |
316 | } |
| … | |
… | |
| 1375 | */ |
1375 | */ |
| 1376 | if (last && last->below && last != floor) |
1376 | if (last && last->below && last != floor) |
| 1377 | top = last->below; |
1377 | top = last->below; |
| 1378 | } |
1378 | } |
| 1379 | } /* If objects on this space */ |
1379 | } /* If objects on this space */ |
| 1380 | |
|
|
| 1381 | if (flag & INS_MAP_LOAD) |
1380 | if (flag & INS_MAP_LOAD) |
| 1382 | top = ms.top; |
1381 | top = ms.top; |
| 1383 | |
1382 | |
| 1384 | if (flag & INS_ABOVE_FLOOR_ONLY) |
1383 | if (flag & INS_ABOVE_FLOOR_ONLY) |
| 1385 | top = floor; |
1384 | top = floor; |
| … | |
… | |
| 2640 | } |
2639 | } |
| 2641 | |
2640 | |
| 2642 | const materialtype_t * |
2641 | const materialtype_t * |
| 2643 | object::dominant_material () const |
2642 | object::dominant_material () const |
| 2644 | { |
2643 | { |
| 2645 | if (materialtype_t *mat = name_to_material (materialname)) |
2644 | if (materialtype_t *mt = name_to_material (materialname)) |
| 2646 | return mat; |
2645 | return mt; |
| 2647 | |
2646 | |
| 2648 | // omfg this is slow, this has to be temporary :) |
|
|
| 2649 | shstr unknown ("unknown"); |
|
|
| 2650 | |
|
|
| 2651 | return name_to_material (unknown); |
2647 | return name_to_material (shstr_unknown); |
| 2652 | } |
2648 | } |
| 2653 | |
2649 | |
| 2654 | void |
2650 | void |
| 2655 | object::open_container (object *new_container) |
2651 | object::open_container (object *new_container) |
| 2656 | { |
2652 | { |
| … | |
… | |
| 2732 | force->flag [FLAG_APPLIED] = true; |
2728 | force->flag [FLAG_APPLIED] = true; |
| 2733 | |
2729 | |
| 2734 | insert (force); |
2730 | insert (force); |
| 2735 | } |
2731 | } |
| 2736 | |
2732 | |
| 2737 | |
2733 | void |
|
|
2734 | object::play_sound (faceidx sound) const |
|
|
2735 | { |
|
|
2736 | if (map) |
|
|
2737 | map->play_sound (sound, x, y); |
|
|
2738 | } |
