From fb47dd01d51632aa3031dfa0b474249ebbfe9fa3 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Mon, 8 Aug 2022 21:04:12 -0500
Subject: [PATCH] Working up until ball toss.

---
 Rollercoaster.singe | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Rollercoaster.singe b/Rollercoaster.singe
index c0cae3b..c9dbae1 100644
--- a/Rollercoaster.singe
+++ b/Rollercoaster.singe
@@ -53,6 +53,7 @@ STATE_CHOOSE_PRIZE  = 20
 STATE_WON_GAME      = 21
 STATE_EXIT_GAME     = 22
 STATE_PUT_WHERE     = 23
+STATE_LASERDISC     = 24
 
 -- Apple II 40 column font.
 fntApple12       = fontLoad(GAME .. "/Fonts/PrintChar21.ttf", 12)
@@ -298,6 +299,7 @@ function onOverlayUpdate()
 			BLINK = 0
 			-- Are we delaying for something?
 			if DELAY > 0 then
+				STATE = STATE_NONE
 				KEYBOARD_ON = OFF
 				DELAY = DELAY - 1
 				if DELAY == 0 then
@@ -402,6 +404,7 @@ function pioneer(newstate, command)
 		-- Hide keyboard while video runs.
 		KEYBOARD_ON = OFF
 		NEXT_STATE = newstate
+		STATE = STATE_LASERDISC
 	end
 	
 	debugPrint("Laserdisc " .. command .. " NEXT_STATE " .. NEXT_STATE .. " STATE " .. STATE)
@@ -777,6 +780,8 @@ STATES = {
 				if what == "YES" or what == "Y" then
 					screenPrint("SHE UNLOCKS THE DOOR TO THE SOUTH.")
 					OBJECTS[8].LOCATION = -2
+					STATE = STATE_NONE
+					NEXT_STATE = STATE_PARSER
 				else
 					screenPrint("PLEASE ANSWER YES OR NO.")
 					NEXT_STATE  = STATE_ROOM_8
@@ -1125,6 +1130,7 @@ STATES = {
 			pioneer(STATE_PLAY_AGAIN, "FR19801SE/FR20007PL/")
 		end
 
+		-- Make sure we keep parsing.
 		if STATE == STATE_NONE then
 			NEXT_STATE = STATE_PARSER
 		end
@@ -1173,8 +1179,8 @@ STATES = {
 		screenPrint("GOOD SHOOTING.")
 		screenPrint("HE HANDS YOU A TEDDY BEAR.")
 		OBJECTS[8].LOCATION = 0
-		DELAY = 1
-		NEXT_STATE = STATE_NONE
+		STATE = NONE
+		NEXT_STATE = STATE_PARSER
 	end,
 	
 	[STATE_CHOOSE_PRIZE] = function(what)
@@ -1188,6 +1194,7 @@ STATES = {
 				if what == "RADIO" then
 					pioneer(STATE_PARSER, "FR1234SE/")
 				else
+					STATE = NONE
 					NEXT_STATE = STATE_PARSER
 				end
 			end
@@ -1244,7 +1251,8 @@ STATES = {
 							B = 1
 						end
 					end
-					STATE = STATE_PARSER
+					STATE = NONE
+					NEXT_STATE = STATE_PARSER
 				end
 			end
 		end