| 1 | /* |
1 | /* |
| 2 | * static char *rcsid_spell_attack_c = |
2 | * static char *rcsid_spell_attack_c = |
| 3 | * "$Id: spell_attack.C,v 1.3 2006/08/15 16:19:55 elmex Exp $"; |
3 | * "$Id: spell_attack.C,v 1.4 2006/08/15 17:35:51 elmex Exp $"; |
| 4 | */ |
4 | */ |
| 5 | |
5 | |
| 6 | |
6 | |
| 7 | /* |
7 | /* |
| 8 | CrossFire, A Multiplayer game for X-windows |
8 | CrossFire, A Multiplayer game for X-windows |
| … | |
… | |
| 409 | } |
409 | } |
| 410 | |
410 | |
| 411 | // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps |
411 | // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps |
| 412 | // NOTE: If this breaks something important: remove this. I can't think of anything |
412 | // NOTE: If this breaks something important: remove this. I can't think of anything |
| 413 | // bad at the moment that might happen from this. |
413 | // bad at the moment that might happen from this. |
| 414 | if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE_MAP) |
414 | if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) |
| 415 | { |
415 | { |
| 416 | remove_ob (op); |
416 | remove_ob (op); |
| 417 | free_object (op); |
417 | free_object (op); |
| 418 | return; |
418 | return; |
| 419 | } |
419 | } |
| … | |
… | |
| 933 | } |
933 | } |
| 934 | |
934 | |
| 935 | // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding |
935 | // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding |
| 936 | // on a safe map. I don't like this special casing, but it seems to be neccessary |
936 | // on a safe map. I don't like this special casing, but it seems to be neccessary |
| 937 | // as bombs can be carried. |
937 | // as bombs can be carried. |
| 938 | if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE_MAP) |
938 | if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) |
| 939 | { |
939 | { |
| 940 | remove_ob (op); |
940 | remove_ob (op); |
| 941 | free_object (op); |
941 | free_object (op); |
| 942 | return; |
942 | return; |
| 943 | } |
943 | } |
