libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed _inputting & _inputReady from uint8 to bool.

Browse Source 
svn-id: r39258
This commit is contained in:
Travis Howell 2009-03-09 03:58:18 +00:00
parent 7cd40da1be
commit 269754759f
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engines/agos/agos.h
View File

@ -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;

12
engines/agos/input.cpp
View File

@ -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;
}
}

4
engines/agos/pn.cpp
View File

@ -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;

2
engines/agos/script_pn.cpp
View File

@ -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)