… | |
… | |
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 | } |
… | |
… | |
959 | if (destroyed ()) |
959 | if (destroyed ()) |
960 | return; |
960 | return; |
961 | |
961 | |
962 | if (destroy_inventory) |
962 | if (destroy_inventory) |
963 | destroy_inv (false); |
963 | destroy_inv (false); |
|
|
964 | |
|
|
965 | if (sound_destroy) |
|
|
966 | play_sound (sound_destroy); |
|
|
967 | else if (flag [FLAG_MONSTER]) |
|
|
968 | play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism |
964 | |
969 | |
965 | attachable::destroy (); |
970 | attachable::destroy (); |
966 | } |
971 | } |
967 | |
972 | |
968 | /* |
973 | /* |
… | |
… | |
2728 | force->flag [FLAG_APPLIED] = true; |
2733 | force->flag [FLAG_APPLIED] = true; |
2729 | |
2734 | |
2730 | insert (force); |
2735 | insert (force); |
2731 | } |
2736 | } |
2732 | |
2737 | |
2733 | |
|
|