diff --git a/src/outfit.c b/src/outfit.c index 8f7aeef..c5e6c2a 100644 --- a/src/outfit.c +++ b/src/outfit.c @@ -609,15 +609,15 @@ static void outfit_parseSBeam(Outfit* tmp, const xmlNodePtr parent) { #define MELEMENT(o,s) if(0) WARN("Outfit '%s' missing/invalid '"s"' element", tmp->name) MELEMENT(tmp->u.bem.gfx==NULL, "gfx"); - MELEMENT((sound_disabled!=0) && (tmp->u.bem.warmup > 0.) && (tmp->u.bem.sound<0), "sound_warmup"); - MELEMENT((sound_disabled!=0) && (tmp->u.bem.sound < 0), "sound"); - MELEMENT((sound_disabled!=0) && (tmp->u.bem.sound_off < 0), "sound_off"); - MELEMENT(tmp->u.bem.delay==0, "range"); - MELEMENT(tmp->u.bem.duration==0, "duration"); - MELEMENT(tmp->u.bem.range==0, "range"); - MELEMENT(tmp->u.bem.turn==0, "turn"); - MELEMENT(tmp->u.bem.energy==0, "energy"); - MELEMENT(tmp->u.bem.damage==0, "damage"); + MELEMENT((sound_disabled!=0) && (tmp->u.bem.warmup > 0.) && (tmp->u.bem.sound<0),"sound_warmup"); + MELEMENT((sound_disabled!=0) && (tmp->u.bem.sound < 0), "sound"); + MELEMENT((sound_disabled!=0) && (tmp->u.bem.sound_off < 0), "sound_off"); + MELEMENT(tmp->u.bem.delay==0, "range"); + MELEMENT(tmp->u.bem.duration==0, "duration"); + MELEMENT(tmp->u.bem.range==0, "range"); + MELEMENT((tmp->type!=OUTFIT_TYPE_BEAM) && (tmp->u.bem.turn==0), "turn"); + MELEMENT(tmp->u.bem.energy==0, "energy"); + MELEMENT(tmp->u.bem.damage==0, "damage"); #undef MELEMENT }