From 269754759f3c4f7ebb2e33f55f429239b1345aae Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Mon, 9 Mar 2009 03:58:18 +0000
Subject: Changed _inputting & _inputReady from uint8 to bool.

svn-id: r39258
---
 engines/agos/agos.h        | 11 ++++-------
 engines/agos/input.cpp     | 12 ++++++------
 engines/agos/pn.cpp        |  4 ++--
 engines/agos/script_pn.cpp |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index afd9a1ec1b..cafc732458 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -1374,9 +1374,6 @@ public:
 	void opn_opcode62();
 	void opn_opcode63();
 
-	// Video Script Opcodes, Personal Nightmare
-	void vc36_pause();
-
 	stackframe *_stackbase;
 
 	byte *_dataBase, *_textBase;
@@ -1394,10 +1391,10 @@ public:
 	char _objectName1[15], _objectName2[15];
 	char _inMessage[20];
 	char _placeMessage[15];
-	uint8 _inputReady;
-	uint8 _inputting;
+	bool _inputReady;
+	bool _inputting;
 	uint16 _intputCounter, _inputMax;
-	uint16 _mousePrintFG;
+	uint16 _mousePrintFG; // NOTE: Currently not used
 	HitArea *_dragStore;
 	uint8 _hitCalled;
 
@@ -1411,7 +1408,7 @@ public:
 	int16 _objectCountS;
 
         int16 _bp;
-	int _xofs;
+	int16 _xofs;
 	int16 _havinit;
 	uint16 _seed;
 
diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp
index 2e9291288c..618ec11d8a 100644
--- a/engines/agos/input.cpp
+++ b/engines/agos/input.cpp
@@ -609,8 +609,8 @@ bool AGOSEngine::processSpecialKeys() {
 #ifdef ENABLE_PN
 // Personal Nightmare specific
 void AGOSEngine_PN::clearInputLine() {
-	_inputting = 0;
-	_inputReady = 0;
+	_inputting = false;
+	_inputReady = false;
 	clearWindow(_windowArray[2]);
 }
 
@@ -659,7 +659,7 @@ void AGOSEngine_PN::handleKeyboard() {
 		_mouseString = 0;
 		_mouseString1 = 0;
 		_mousePrintFG = 0;
-		_inputReady = 0;	
+		_inputReady = false;
 	}
 
 	_keyPressed.reset();
@@ -672,8 +672,8 @@ void AGOSEngine_PN::interact(char *buffer, uint8 size) {
 		_inputMax = size;
 		_inputWindow = _windowArray[_curWindow];
 		windowPutChar(_inputWindow, 128);
-		_inputting = 1;
-		_inputReady = 1;
+		_inputting = true;
+		_inputReady = true;
 	}
 	
 	while (!shouldQuit() && _inputReady) {
@@ -688,7 +688,7 @@ void AGOSEngine_PN::interact(char *buffer, uint8 size) {
 
 	if (!_inputReady) {
 		memcpy(buffer, _keyboardBuffer, size);
-		_inputting = 0;
+		_inputting = false;
 	}
 }
 
diff --git a/engines/agos/pn.cpp b/engines/agos/pn.cpp
index ee02b71c0f..91c5a43ba2 100644
--- a/engines/agos/pn.cpp
+++ b/engines/agos/pn.cpp
@@ -51,8 +51,8 @@ AGOSEngine_PN::AGOSEngine_PN(OSystem *system)
 
 	_dragStore = 0;
 	_hitCalled = 0;
-	_inputReady = 0;
-	_inputting = 0;
+	_inputReady = false;
+	_inputting = false;
 	_intputCounter = 0;
 	_inputMax = 0;
 	_mousePrintFG = 0;
diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index f4aed48349..896dc13cdf 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.cpp
@@ -480,7 +480,7 @@ void AGOSEngine_PN::opn_opcode36() {
 void AGOSEngine_PN::opn_opcode37() {
 	_curwrdptr = NULL;
 
-	_inputReady = 1;
+	_inputReady = true;
 	interact(_inputline, 49);
 
 	if ((_inpp = strchr(_inputline,'\n')) != NULL)
-- 
cgit v1.2.3