[Scummvm-cvs-logs] SF.net SVN: scummvm:[39258] scummvm/trunk/engines/agos
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Mon Mar 9 04:58:19 CET 2009
Revision: 39258
http://scummvm.svn.sourceforge.net/scummvm/?rev=39258&view=rev
Author: Kirben
Date: 2009-03-09 03:58:18 +0000 (Mon, 09 Mar 2009)
Log Message:
-----------
Changed _inputting & _inputReady from uint8 to bool.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/input.cpp
scummvm/trunk/engines/agos/pn.cpp
scummvm/trunk/engines/agos/script_pn.cpp
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2009-03-09 03:45:40 UTC (rev 39257)
+++ scummvm/trunk/engines/agos/agos.h 2009-03-09 03:58:18 UTC (rev 39258)
@@ -1374,9 +1374,6 @@
void opn_opcode62();
void opn_opcode63();
- // Video Script Opcodes, Personal Nightmare
- void vc36_pause();
-
stackframe *_stackbase;
byte *_dataBase, *_textBase;
@@ -1394,10 +1391,10 @@
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 @@
int16 _objectCountS;
int16 _bp;
- int _xofs;
+ int16 _xofs;
int16 _havinit;
uint16 _seed;
Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp 2009-03-09 03:45:40 UTC (rev 39257)
+++ scummvm/trunk/engines/agos/input.cpp 2009-03-09 03:58:18 UTC (rev 39258)
@@ -609,8 +609,8 @@
#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 @@
_mouseString = 0;
_mouseString1 = 0;
_mousePrintFG = 0;
- _inputReady = 0;
+ _inputReady = false;
}
_keyPressed.reset();
@@ -672,8 +672,8 @@
_inputMax = size;
_inputWindow = _windowArray[_curWindow];
windowPutChar(_inputWindow, 128);
- _inputting = 1;
- _inputReady = 1;
+ _inputting = true;
+ _inputReady = true;
}
while (!shouldQuit() && _inputReady) {
@@ -688,7 +688,7 @@
if (!_inputReady) {
memcpy(buffer, _keyboardBuffer, size);
- _inputting = 0;
+ _inputting = false;
}
}
Modified: scummvm/trunk/engines/agos/pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/pn.cpp 2009-03-09 03:45:40 UTC (rev 39257)
+++ scummvm/trunk/engines/agos/pn.cpp 2009-03-09 03:58:18 UTC (rev 39258)
@@ -51,8 +51,8 @@
_dragStore = 0;
_hitCalled = 0;
- _inputReady = 0;
- _inputting = 0;
+ _inputReady = false;
+ _inputting = false;
_intputCounter = 0;
_inputMax = 0;
_mousePrintFG = 0;
Modified: scummvm/trunk/engines/agos/script_pn.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_pn.cpp 2009-03-09 03:45:40 UTC (rev 39257)
+++ scummvm/trunk/engines/agos/script_pn.cpp 2009-03-09 03:58:18 UTC (rev 39258)
@@ -480,7 +480,7 @@
void AGOSEngine_PN::opn_opcode37() {
_curwrdptr = NULL;
- _inputReady = 1;
+ _inputReady = true;
interact(_inputline, 49);
if ((_inpp = strchr(_inputline,'\n')) != NULL)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list