From 57c7593325c23719cbf3845a9a042b0c630b1b83 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sun, 1 Mar 2009 02:20:22 +0000
Subject: Implemented proper support for the Pause 'p' key

svn-id: r38995
---
 engines/cruise/cruise_main.cpp | 9 +++------
 engines/cruise/cruise_main.h   | 1 -
 engines/cruise/function.cpp    | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'engines')

diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 04e6a2167d..d24a500cae 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -43,10 +43,6 @@ void drawBlackSolidBoxSmall() {
 	drawSolidBox(64, 100, 256, 117, 0);
 }
 
-void resetRaster(uint8 *rasterPtr, int32 rasterSize) {
-	memset(rasterPtr, 0, rasterSize);
-}
-
 void loadPakedFileToMem(int fileIdx, uint8 *buffer) {
 	changeCursor(CURSOR_DISK);
 
@@ -1267,7 +1263,6 @@ void closeAllMenu(void) {
 }
 
 int processInput(void) {
-	static bool pausedButtonDown = false;
 	int16 mouseX = 0;
 	int16 mouseY = 0;
 	int16 button = 0;
@@ -1312,7 +1307,9 @@ int processInput(void) {
 	if (keyboardCode == Common::KEYCODE_p) {
 		keyboardCode = Common::KEYCODE_INVALID;
 		_vm->pauseEngine(true);
+		mouseOff();
 
+		bool pausedButtonDown = false;
 		while (!_vm->shouldQuit()) {
 			getMouseStatus(&main10, &mouseX, &button, &mouseY);
 
@@ -1331,8 +1328,8 @@ int processInput(void) {
 			return 1;
 
 		keyboardCode = Common::KEYCODE_INVALID;
-		pausedButtonDown = false;
 		_vm->pauseEngine(false);
+		mouseOn();
 		return 0;
 	}
 
diff --git a/engines/cruise/cruise_main.h b/engines/cruise/cruise_main.h
index 9ec38231e7..602a72a98c 100644
--- a/engines/cruise/cruise_main.h
+++ b/engines/cruise/cruise_main.h
@@ -109,7 +109,6 @@ int getProcParam(int overlayIdx, int param2, const char * name);
 void changeScriptParamInList(int param1, int param2, scriptInstanceStruct * pScriptInstance, int newValue, int param3);
 uint8 *getDataFromData3(ovlData3Struct * ptr, int param);
 void removeExtention(const char *name, char *buffer);
-void resetRaster(uint8 * rasterPtr, int32 rasterSize);
 void resetPtr2(scriptInstanceStruct * ptr);
 void getFileExtention(const char *name, char *buffer);
 void *allocAndZero(int size);
diff --git a/engines/cruise/function.cpp b/engines/cruise/function.cpp
index a47e759e75..65108d9c79 100644
--- a/engines/cruise/function.cpp
+++ b/engines/cruise/function.cpp
@@ -666,7 +666,7 @@ int16 Op_RemoveCell(void) {
 	return 0;
 }
 
-int16 fontFileIndex;
+int16 fontFileIndex = -1;
 
 int16 Op_SetFont(void) {
 	fontFileIndex = popVar();
-- 
cgit v1.2.3