[Scummvm-cvs-logs] SF.net SVN: scummvm: [27636] scummvm/trunk/engines/sword1

[fingolfin at users.sourceforge.net]

Revision: 27636
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27636&view=rev
Author:   fingolfin
Date:     2007-06-22 15:19:17 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
BS1: Make use of Common::KeySate::reset()

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/control.cpp
    scummvm/trunk/engines/sword1/sword1.cpp

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2007-06-22 22:18:56 UTC (rev 27635)
+++ scummvm/trunk/engines/sword1/control.cpp	2007-06-22 22:19:17 UTC (rev 27636)
@@ -224,7 +224,7 @@
 uint8 Control::runPanel(void) {
 	_mouseDown = false;
 	_restoreBuf = NULL;
-	_keyPressed.keycode = Common::KEYCODE_INVALID;
+	_keyPressed.reset();
 	_numButtons = 0;
 	_screenBuf = (uint8*)malloc(640 * 480);
 	memset(_screenBuf, 0, 640 * 480);
@@ -1037,7 +1037,7 @@
 
 	uint32 now = _system->getMillis();
 	uint32 endTime = now + msecs;
-	_keyPressed.keycode = Common::KEYCODE_INVALID;	//reset
+	_keyPressed.reset();
 	_mouseState = 0;
 
 	do {

Modified: scummvm/trunk/engines/sword1/sword1.cpp
===================================================================
--- scummvm/trunk/engines/sword1/sword1.cpp	2007-06-22 22:18:56 UTC (rev 27635)
+++ scummvm/trunk/engines/sword1/sword1.cpp	2007-06-22 22:19:17 UTC (rev 27636)
@@ -635,7 +635,7 @@
 
 uint8 SwordEngine::mainLoop(void) {
 	uint8 retCode = 0;
-	_keyPressed.keycode = Common::KEYCODE_INVALID;
+	_keyPressed.reset();
 
 	while ((retCode == 0) && (!_systemVars.engineQuit)) {
 		// do we need the section45-hack from sword.c here?
@@ -685,7 +685,7 @@
 					_screen->fullRefresh();
 			}
 			_mouseState = 0;
-			_keyPressed.keycode = Common::KEYCODE_INVALID;
+			_keyPressed.reset();
 		} while ((Logic::_scriptVars[SCREEN] == Logic::_scriptVars[NEW_SCREEN]) && (retCode == 0) && (!_systemVars.engineQuit));
 
 		if ((retCode == 0) && (Logic::_scriptVars[SCREEN] != 53) && _systemVars.wantFade && (!_systemVars.engineQuit)) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.