mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-27 22:42:29 +00:00
- Fixed: ApplyActorDefault() must ensure that dataint is non-negative before
calculating a non-NULL state. When compiling with Visual C++, states are stored in the defaults list as byte values, but when compiling with GCC, they are passed as 32-bit arguments to the function directly. So in VC++, using ~0 to specify a NULL state appears as 255, but in GCC, it appears as -1. SVN r121 (trunk)
This commit is contained in:
parent
2ad91cc973
commit
c4bda7e0be
2 changed files with 9 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
May 16, 2006
|
||||||
|
- Fixed: ApplyActorDefault() must ensure that dataint is non-negative before
|
||||||
|
calculating a non-NULL state. When compiling with Visual C++, states are
|
||||||
|
stored in the defaults list as byte values, but when compiling with GCC,
|
||||||
|
they are passed as 32-bit arguments to the function directly. So in VC++,
|
||||||
|
using ~0 to specify a NULL state appears as 255, but in GCC, it appears as
|
||||||
|
-1.
|
||||||
|
|
||||||
May 16, 2006 (Changes by Graf Zahl)
|
May 16, 2006 (Changes by Graf Zahl)
|
||||||
- Added a missing NULL pointer check to APlayerPawn::Tick.
|
- Added a missing NULL pointer check to APlayerPawn::Tick.
|
||||||
- Fixed: The falling scream should not be played when the player is under
|
- Fixed: The falling scream should not be played when the player is under
|
||||||
|
|
|
@ -109,7 +109,7 @@ static void ApplyActorDefault (int defnum, const char *datastr, int dataint)
|
||||||
datasound = S_FindSound (datastr);
|
datasound = S_FindSound (datastr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (defnum > ADEF_LastString && dataint < 255)
|
else if (defnum > ADEF_LastString && dataint >= 0 && dataint < 255)
|
||||||
{
|
{
|
||||||
datastate = DefaultStates (sgClass) + dataint;
|
datastate = DefaultStates (sgClass) + dataint;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue