--- deliantra/server/server/spell_attack.C 2006/08/15 16:19:55 1.3 +++ deliantra/server/server/spell_attack.C 2006/08/15 17:35:51 1.4 @@ -1,6 +1,6 @@ /* * static char *rcsid_spell_attack_c = - * "$Id: spell_attack.C,v 1.3 2006/08/15 16:19:55 elmex Exp $"; + * "$Id: spell_attack.C,v 1.4 2006/08/15 17:35:51 elmex Exp $"; */ @@ -411,7 +411,7 @@ // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent explosions of any kind on safe maps // NOTE: If this breaks something important: remove this. I can't think of anything // bad at the moment that might happen from this. - if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE_MAP) + if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) { remove_ob (op); free_object (op); @@ -935,7 +935,7 @@ // elmex Tue Aug 15 17:46:51 CEST 2006: Prevent bomb from exploding // on a safe map. I don't like this special casing, but it seems to be neccessary // as bombs can be carried. - if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE_MAP) + if (get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_SAFE) { remove_ob (op); free_object (op);