[Scummvm-cvs-logs] SF.net SVN: scummvm: [27625] scummvm/trunk

[fingolfin at users.sourceforge.net]

Revision: 27625
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27625&view=rev
Author:   fingolfin
Date:     2007-06-22 14:16:07 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
Cleaning up after myself (I blame it on, err, uhh... the Vogons?)

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp
    scummvm/trunk/common/events.h
    scummvm/trunk/engines/cine/main_loop.cpp
    scummvm/trunk/engines/cine/various.cpp
    scummvm/trunk/engines/kyra/kyra.cpp
    scummvm/trunk/engines/lure/surface.cpp
    scummvm/trunk/engines/queen/input.cpp
    scummvm/trunk/engines/sword1/control.cpp

Modified: scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/backends/platform/ds/arm9/source/touchkeyboard.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -117,7 +117,7 @@
 	{51,				29,		6,		Common::KEYCODE_UP},
 	
 	// Close button
-	{56,				30,		0,		Common::KEYCODE_INALID},
+	{56,				30,		0,		Common::KEYCODE_INVALID},
 	
 };
 
@@ -237,7 +237,7 @@
 				Common::Event event;
 				
 //				consolePrintf("Key: %d\n", r);
-				if ((keys[r].character == Common::KEYCODE_INALID)) {
+				if ((keys[r].character == Common::KEYCODE_INVALID)) {
 					// Close button
 					DS::closed = true;
 				} else	if ((keys[r].character >= '0') && (keys[r].character <= '9')) {

Modified: scummvm/trunk/common/events.h
===================================================================
--- scummvm/trunk/common/events.h	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/common/events.h	2007-06-22 21:16:07 UTC (rev 27625)
@@ -68,7 +68,7 @@
 };
 
 enum KeyCode {
-	KEYCODE_INALID      = 0,
+	KEYCODE_INVALID     = 0,
 
 	KEYCODE_BACKSPACE   = 8,
 	KEYCODE_TAB         = 9,

Modified: scummvm/trunk/engines/cine/main_loop.cpp
===================================================================
--- scummvm/trunk/engines/cine/main_loop.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/engines/cine/main_loop.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -77,7 +77,7 @@
 					mouseLeft = 1;
 				}
 				break;
-			case Common::KEYCODE_ESC:
+			case Common::KEYCODE_ESCAPE:
 				if (allowPlayerInput) {
 					mouseRight = 1;
 				}

Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/engines/cine/various.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -25,6 +25,7 @@
 
 #include "common/stdafx.h"
 #include "common/endian.h"
+#include "common/events.h"
 #include "common/savefile.h"
 
 #include "cine/cine.h"

Modified: scummvm/trunk/engines/kyra/kyra.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/engines/kyra/kyra.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -617,7 +617,7 @@
 						_quitFlag = true;
 				} else if (event.kbd.keycode == '.')
 						_skipFlag = true;
-				else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESC) {
+				else if (event.kbd.keycode == Common::KEYCODE_RETURN || event.kbd.keycode == Common::KEYCODE_SPACE || event.kbd.keycode == Common::KEYCODE_ESCAPE) {
 					_abortIntroFlag = true;
 					_skipFlag = true;
 				}

Modified: scummvm/trunk/engines/lure/surface.cpp
===================================================================
--- scummvm/trunk/engines/lure/surface.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/engines/lure/surface.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -430,7 +430,7 @@
 						mouse.cursorOn();
 						return true;
 					}
-					else if (keycode == Common::KEYCODE_ESC) {
+					else if (keycode == Common::KEYCODE_ESCAPE) {
 						// Escape character
 						screen.screen().fillRect(
 							Rect(x, y, x + maxSize - 1, y + FONT_HEIGHT), bgColour);

Modified: scummvm/trunk/engines/queen/input.cpp
===================================================================
--- scummvm/trunk/engines/queen/input.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/engines/queen/input.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -55,7 +55,7 @@
 	_system(system), _eventMan(system->getEventManager()), _fastMode(false),
 	_keyVerb(VERB_NONE), _cutawayRunning(false), _canQuit(false),
 	_cutawayQuit(false), _dialogueRunning(false), _talkQuit(false),
-	_quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INALID),
+	_quickSave(false), _quickLoad(false), _debugger(false), _inKey(Common::KEYCODE_INVALID),
 	_mouseButton(0), _idleTime(0) {
 
 	switch (language) {
@@ -201,7 +201,7 @@
 		break;
 	}
 
-	_inKey = Common::KEYCODE_INALID;	// reset
+	_inKey = Common::KEYCODE_INVALID;	// reset
 }
 
 Common::Point Input::getMousePos() const {

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2007-06-22 21:10:57 UTC (rev 27624)
+++ scummvm/trunk/engines/sword1/control.cpp	2007-06-22 21:16:07 UTC (rev 27625)
@@ -1047,9 +1047,10 @@
 			case Common::EVENT_KEYDOWN:
 
 				// Make sure backspace works right (this fixes a small issue on OS X)
-				if (event.kbd.keycode == Common::KEYCODE_BACKSPACE)
+				if (event.kbd.keycode == Common::KEYCODE_BACKSPACE) {
+printf("Mac backspace workaround, was %d\n", event.kbd.ascii);
 					_keyPressed = 8;
-				else
+				} else
 					_keyPressed = (byte)event.kbd.ascii;
 				// we skip the rest of the delay and return immediately
 				// to handle keyboard input


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