zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Remove some GCC warnings. 

SVN r1157 (trunk)
This commit is contained in:
Randy Heit 2008-08-11 22:42:38 +00:00
parent a876ba55bd
commit f40d52c22a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/thingdef/thingdef_properties.cpp
View File

@ -2172,7 +2172,8 @@ static void PowerupColor (FScanner &sc, APowerupGiver *defaults, Baggage &bag)
} }
else else
{ {
sc.ScriptError("\"%s\" requires an actor of type \"Powerup\"\n", sc.String); sc.ScriptError("\"%s\" requires an actor of type \"Powerup\"\n", sc.String);
return;
} }
if (sc.CheckNumber()) if (sc.CheckNumber())
@ -2231,6 +2232,8 @@ static void PowerupDuration (FScanner &sc, APowerupGiver *defaults, Baggage &bag
{ {
int *pEffectTics; int *pEffectTics;
sc.MustGetNumber();
if (bag.Info->Class->IsDescendantOf(RUNTIME_CLASS(APowerup))) if (bag.Info->Class->IsDescendantOf(RUNTIME_CLASS(APowerup)))
{ {
pEffectTics = &((APowerup*)defaults)->EffectTics; pEffectTics = &((APowerup*)defaults)->EffectTics;
@ -2241,11 +2244,10 @@ static void PowerupDuration (FScanner &sc, APowerupGiver *defaults, Baggage &bag
} }
else else
{ {
sc.ScriptError("\"%s\" requires an actor of type \"Powerup\"\n", sc.String); sc.ScriptError("\"%s\" requires an actor of type \"Powerup\"\n", sc.String);
return;
} }
*pEffectTics = (sc.Number >= 0) ? sc.Number : -sc.Number * TICRATE;
sc.MustGetNumber();
*pEffectTics = sc.Number>=0? sc.Number : -sc.Number*TICRATE;
} }
//========================================================================== //==========================================================================

2
src/thingdef/thingdef_states.cpp
View File

@ -492,7 +492,7 @@ int ParseStates(FScanner &sc, FActorInfo * actor, AActor * defaults, Baggage &ba
FState * laststate = NULL; FState * laststate = NULL;
intptr_t lastlabel = -1; intptr_t lastlabel = -1;
int minrequiredstate = -1; int minrequiredstate = -1;
int spriteindex; int spriteindex = 0;
char lastsprite[5]=""; char lastsprite[5]="";
sc.MustGetStringName ("{"); sc.MustGetStringName ("{");