[Scummvm-cvs-logs] SF.net SVN: scummvm: [27632] scummvm/trunk/backends/platform/psp/ osys_psp_gu.cpp

[joostp at users.sourceforge.net]

Revision: 27632
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27632&view=rev
Author:   joostp
Date:     2007-06-22 15:06:25 -0700 (Fri, 22 Jun 2007)

Log Message:
-----------
fix compilation by casting the %, {, }, | and ~ keycode "magic" numbers to Common::KeyCode

Modified Paths:
--------------
    scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp

Modified: scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp	2007-06-22 22:00:46 UTC (rev 27631)
+++ scummvm/trunk/backends/platform/psp/osys_psp_gu.cpp	2007-06-22 22:06:25 UTC (rev 27632)
@@ -62,8 +62,8 @@
 Common::KeyCode  kbd_code[] = {Common::KEYCODE_1, Common::KEYCODE_2, Common::KEYCODE_3, Common::KEYCODE_4, Common::KEYCODE_5, Common::KEYCODE_6, Common::KEYCODE_7, Common::KEYCODE_8, Common::KEYCODE_9, Common::KEYCODE_0, Common::KEYCODE_MINUS, Common::KEYCODE_EQUALS, Common::KEYCODE_LEFTBRACKET, Common::KEYCODE_RIGHTBRACKET,
 							Common::KEYCODE_BACKSLASH, Common::KEYCODE_SEMICOLON, Common::KEYCODE_QUOTE, Common::KEYCODE_COMMA, Common::KEYCODE_PERIOD, Common::KEYCODE_SLASH, Common::KEYCODE_BACKQUOTE};
 unsigned char kbd_ascii_cl[] = {'!', '@', '#', '$', '%', '^', '&', '*', '(', ')', '_', '+', '{', '}', '|', ':', '"', '<', '>', '?', '~'};
-Common::KeyCode  kbd_code_cl[]  = {Common::KEYCODE_EXCLAIM, Common::KEYCODE_AT, Common::KEYCODE_HASH, Common::KEYCODE_DOLLAR, 37, Common::KEYCODE_CARET, Common::KEYCODE_AMPERSAND, Common::KEYCODE_ASTERISK, Common::KEYCODE_LEFTPAREN, Common::KEYCODE_RIGHTPAREN, Common::KEYCODE_UNDERSCORE,
-								Common::KEYCODE_PLUS, 123, 125, 124, Common::KEYCODE_COLON, Common::KEYCODE_QUOTEDBL, Common::KEYCODE_LESS, Common::KEYCODE_GREATER, Common::KEYCODE_QUESTION, 126};
+Common::KeyCode  kbd_code_cl[]  = {Common::KEYCODE_EXCLAIM, Common::KEYCODE_AT, Common::KEYCODE_HASH, Common::KEYCODE_DOLLAR, (Common::KeyCode)37, Common::KEYCODE_CARET, Common::KEYCODE_AMPERSAND, Common::KEYCODE_ASTERISK, Common::KEYCODE_LEFTPAREN, Common::KEYCODE_RIGHTPAREN, Common::KEYCODE_UNDERSCORE,
+								Common::KEYCODE_PLUS, (Common::KeyCode)123, (Common::KeyCode)125, (Common::KeyCode)124, Common::KEYCODE_COLON, Common::KEYCODE_QUOTEDBL, Common::KEYCODE_LESS, Common::KEYCODE_GREATER, Common::KEYCODE_QUESTION, (Common::KeyCode)126};
 #define CAPS_LOCK	(1 << 0)
 #define SYMBOLS 	(1 << 1)
 
@@ -555,11 +555,11 @@
 					case 0:
 						event.kbd.flags = 0;
 						event.kbd.ascii = 'a'+_keySelected-1;
-						event.kbd.keycode = Common::KEYCODE_a + _keySelected-1;
+						event.kbd.keycode = (Common::KeyCode)(Common::KEYCODE_a + _keySelected-1);
 						break;
 					case CAPS_LOCK:
 						event.kbd.ascii = 'A'+_keySelected-1;
-						event.kbd.keycode = Common::KEYCODE_a + _keySelected-1;
+						event.kbd.keycode = (Common::KeyCode)(Common::KEYCODE_a + _keySelected-1);
 						event.kbd.flags = Common::KBD_SHIFT;
 						break;
 					case SYMBOLS:


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