From 95b9eae242ee7c046d84c2816250f1444dae1797 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Wed, 11 Jul 2012 03:14:08 +0000
Subject: [PATCH] - Fixed: PCD_SCRIPTWAITDIRECT had different semantics than
 PCD_SCRIPTWAIT.

SVN r3754 (trunk)
---
 src/p_acs.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index 0352be07e..05c815eb3 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -5297,20 +5297,19 @@ int DLevelScript::RunScript ()
 
 		case PCD_SCRIPTWAIT:
 			statedata = STACK(1);
+			sp--;
+scriptwait:
 			if (controller->RunningScripts.CheckKey(statedata) != NULL)
 				state = SCRIPT_ScriptWait;
 			else
 				state = SCRIPT_ScriptWaitPre;
-			sp--;
 			PutLast ();
 			break;
 
 		case PCD_SCRIPTWAITDIRECT:
-			state = SCRIPT_ScriptWait;
 			statedata = uallong(pc[0]);
 			pc++;
-			PutLast ();
-			break;
+			goto scriptwait;
 
 		case PCD_CLEARLINESPECIAL:
 			if (activationline != NULL)