mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-10 23:01:59 +00:00
- Remove some GCC warnings.
SVN r1157 (trunk)
This commit is contained in:
parent
a876ba55bd
commit
f40d52c22a
2 changed files with 8 additions and 6 deletions
|
@ -2173,6 +2173,7 @@ static void PowerupColor (FScanner &sc, APowerupGiver *defaults, Baggage &bag)
|
|||
else
|
||||
{
|
||||
sc.ScriptError("\"%s\" requires an actor of type \"Powerup\"\n", sc.String);
|
||||
return;
|
||||
}
|
||||
|
||||
if (sc.CheckNumber())
|
||||
|
@ -2231,6 +2232,8 @@ static void PowerupDuration (FScanner &sc, APowerupGiver *defaults, Baggage &bag
|
|||
{
|
||||
int *pEffectTics;
|
||||
|
||||
sc.MustGetNumber();
|
||||
|
||||
if (bag.Info->Class->IsDescendantOf(RUNTIME_CLASS(APowerup)))
|
||||
{
|
||||
pEffectTics = &((APowerup*)defaults)->EffectTics;
|
||||
|
@ -2242,10 +2245,9 @@ static void PowerupDuration (FScanner &sc, APowerupGiver *defaults, Baggage &bag
|
|||
else
|
||||
{
|
||||
sc.ScriptError("\"%s\" requires an actor of type \"Powerup\"\n", sc.String);
|
||||
return;
|
||||
}
|
||||
|
||||
sc.MustGetNumber();
|
||||
*pEffectTics = sc.Number>=0? sc.Number : -sc.Number*TICRATE;
|
||||
*pEffectTics = (sc.Number >= 0) ? sc.Number : -sc.Number * TICRATE;
|
||||
}
|
||||
|
||||
//==========================================================================
|
||||
|
|
|
@ -492,7 +492,7 @@ int ParseStates(FScanner &sc, FActorInfo * actor, AActor * defaults, Baggage &ba
|
|||
FState * laststate = NULL;
|
||||
intptr_t lastlabel = -1;
|
||||
int minrequiredstate = -1;
|
||||
int spriteindex;
|
||||
int spriteindex = 0;
|
||||
char lastsprite[5]="";
|
||||
|
||||
sc.MustGetStringName ("{");
|
||||
|
|
Loading…
Reference in a new issue