zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 21:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed typo in r3795's change to GetActorZ and a potential null pointer dereference.

Browse source 
SVN r3796 (trunk)
This commit is contained in:
Randy Heit 2012-07-30 00:50:19 +00:00
parent 9c0b0dc774
commit 0aee56be15
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/p_acs.cpp
View file

@ -6345,10 +6345,17 @@ scriptwait:
case PCD_GETACTORZ: case PCD_GETACTORZ:
{ {
AActor *actor = SingleActorFromTID(STACK(1), activator); AActor *actor = SingleActorFromTID(STACK(1), activator);
STACK(1) = actor == NULL ? 0 : (&actor->x)[pcd - PCD_GETACTORX]; if (actor == NULL)
if (pcd == PCD_GETACTORZ)
{ {
pcd += actor->GetBobOffset(); STACK(1) = 0;
}
else if (pcd == PCD_GETACTORZ)
{
STACK(1) = actor->z + actor->GetBobOffset();
}
else
{
STACK(1) = (&actor->x)[pcd - PCD_GETACTORX];
} }
} }
break; break;