zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-17 23:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fixed: PCD_SCRIPTWAITDIRECT had different semantics than PCD_SCRIPTWAIT.

Browse source 
SVN r3754 (trunk)
This commit is contained in:
Randy Heit 2012-07-11 03:14:08 +00:00
parent ba00e3a185
commit 95b9eae242
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_acs.cpp
View file

@ -5297,20 +5297,19 @@ int DLevelScript::RunScript ()
case PCD_SCRIPTWAIT: case PCD_SCRIPTWAIT:
statedata = STACK(1); statedata = STACK(1);
sp--;
scriptwait:
if (controller->RunningScripts.CheckKey(statedata) != NULL) if (controller->RunningScripts.CheckKey(statedata) != NULL)
state = SCRIPT_ScriptWait; state = SCRIPT_ScriptWait;
else else
state = SCRIPT_ScriptWaitPre; state = SCRIPT_ScriptWaitPre;
sp--;
PutLast (); PutLast ();
break; break;
case PCD_SCRIPTWAITDIRECT: case PCD_SCRIPTWAITDIRECT:
state = SCRIPT_ScriptWait;
statedata = uallong(pc[0]); statedata = uallong(pc[0]);
pc++; pc++;
PutLast (); goto scriptwait;
break;
case PCD_CLEARLINESPECIAL: case PCD_CLEARLINESPECIAL:
if (activationline != NULL) if (activationline != NULL)