Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix] Killed startup warning about missing 'turn' element on non-turret beams.

Browse Source
This commit is contained in:
Allanis 2013-10-03 01:15:08 +01:00
parent 566e96505f
commit 0ae6b8cecd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/outfit.c
View File

@ -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) #define MELEMENT(o,s) if(0) WARN("Outfit '%s' missing/invalid '"s"' element", tmp->name)
MELEMENT(tmp->u.bem.gfx==NULL, "gfx"); 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.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 < 0), "sound");
MELEMENT((sound_disabled!=0) && (tmp->u.bem.sound_off < 0), "sound_off"); MELEMENT((sound_disabled!=0) && (tmp->u.bem.sound_off < 0), "sound_off");
MELEMENT(tmp->u.bem.delay==0, "range"); MELEMENT(tmp->u.bem.delay==0, "range");
MELEMENT(tmp->u.bem.duration==0, "duration"); MELEMENT(tmp->u.bem.duration==0, "duration");
MELEMENT(tmp->u.bem.range==0, "range"); MELEMENT(tmp->u.bem.range==0, "range");
MELEMENT(tmp->u.bem.turn==0, "turn"); MELEMENT((tmp->type!=OUTFIT_TYPE_BEAM) && (tmp->u.bem.turn==0), "turn");
MELEMENT(tmp->u.bem.energy==0, "energy"); MELEMENT(tmp->u.bem.energy==0, "energy");
MELEMENT(tmp->u.bem.damage==0, "damage"); MELEMENT(tmp->u.bem.damage==0, "damage");
#undef MELEMENT #undef MELEMENT
} }