[Scummvm-cvs-logs] CVS: scummvm/backends/dc input.cpp,1.19,1.20
Max Horn
fingolfin at users.sourceforge.net
Sun Dec 5 09:44:08 CET 2004
Update of /cvsroot/scummvm/scummvm/backends/dc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26853/backends/dc
Modified Files:
input.cpp
Log Message:
Clean up OSystem::Event
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/dc/input.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- input.cpp 28 Sep 2004 20:19:22 -0000 1.19
+++ input.cpp 5 Dec 2004 17:42:15 -0000 1.20
@@ -203,13 +203,13 @@
}
event.kbd.ascii = event.kbd.keycode = 0;
if(e<0) {
- event.event_code = (EventCode)-e;
+ event.type = (EventType)-e;
return true;
} else if(e>0) {
bool processed = false, down = !(e&(1<<30));
e &= ~(1<<30);
if(e < 1000) {
- event.event_code = (down? EVENT_KEYDOWN : EVENT_KEYUP);
+ event.type = (down? EVENT_KEYDOWN : EVENT_KEYUP);
event.kbd.keycode = e;
event.kbd.ascii = (e>='a' && e<='z' && (event.kbd.flags & KBD_SHIFT)?
e &~ 0x20 : e);
@@ -221,12 +221,12 @@
}
return processed;
} else if(_ms_cur_x != _ms_old_x || _ms_cur_y != _ms_old_y) {
- event.event_code = EVENT_MOUSEMOVE;
+ event.type = EVENT_MOUSEMOVE;
_ms_old_x = _ms_cur_x;
_ms_old_y = _ms_cur_y;
return true;
} else {
- event.event_code = (EventCode)0;
+ event.type = (EventType)0;
return false;
}
}
More information about the Scummvm-git-logs
mailing list