[Scummvm-cvs-logs] SF.net SVN: scummvm: [28970] scummvm/trunk/backends/platform/dc/input.cpp

[marcus_c at users.sourceforge.net]

Revision: 28970
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28970&view=rev
Author:   marcus_c
Date:     2007-09-19 12:28:05 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Fixed fallout from keycode being made an enum.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/dc/input.cpp

Modified: scummvm/trunk/backends/platform/dc/input.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/input.cpp	2007-09-19 19:26:12 UTC (rev 28969)
+++ scummvm/trunk/backends/platform/dc/input.cpp	2007-09-19 19:28:05 UTC (rev 28970)
@@ -218,7 +218,8 @@
     event.mouse.x -= _overlay_x;
     event.mouse.y -= _overlay_y;
   }
-  event.kbd.ascii = event.kbd.keycode = 0;
+  event.kbd.ascii = 0;
+  event.kbd.keycode = Common::KEYCODE_INVALID;
   if (e<0) {
     event.type = (Common::EventType)-e;
     return true;
@@ -227,7 +228,7 @@
     e &= ~(1<<30);
     if (e < 1000) {
       event.type = (down? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP);
-      event.kbd.keycode = e;
+      event.kbd.keycode = (Common::KeyCode)e;
       event.kbd.ascii = (e>='a' && e<='z' && (event.kbd.flags & Common::KBD_SHIFT)?
 			  e &~ 0x20 : e);
       processed = true;


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