zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-13 07:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: The fix for GCC warnings in PowerupDuration would have caused incorrect error messages in case of incorrect use.

Browse source 
SVN r1158 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-11 23:16:37 +00:00
parent f40d52c22a
commit 9e4b2fb3ec
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/thingdef/thingdef_properties.cpp
View file

@ -2232,7 +2232,6 @@ 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)))
{ {
@ -2247,6 +2246,8 @@ static void PowerupDuration (FScanner &sc, APowerupGiver *defaults, Baggage &bag
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; return;
} }
sc.MustGetNumber();
*pEffectTics = (sc.Number >= 0) ? sc.Number : -sc.Number * TICRATE; *pEffectTics = (sc.Number >= 0) ? sc.Number : -sc.Number * TICRATE;
} }