[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.57,1.58
Torbj?rn Andersson
eriktorbjorn at users.sourceforge.net
Sun Jun 8 07:56:14 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.248,1.249
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.44,2.45 gfx.cpp,2.156,2.157 scumm.h,1.249,1.250 string.cpp,1.134,1.135
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv27940
Modified Files:
sdl-common.cpp
Log Message:
Finally fixed a slight bug in the CoMI cannon behaviour.
Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sdl-common.cpp 8 Jun 2003 12:11:14 -0000 1.57
+++ sdl-common.cpp 8 Jun 2003 14:55:21 -0000 1.58
@@ -457,8 +457,18 @@
}
void OSystem_SDL_Common::warp_mouse(int x, int y) {
- if (_mouseCurState.x != x || _mouseCurState.y != y)
+ if (_mouseCurState.x != x || _mouseCurState.y != y) {
SDL_WarpMouse(x * _scaleFactor, y * _scaleFactor);
+
+ // SDL_WarpMouse() generates a mouse movement event, so
+ // set_mouse_pos() would be called eventually. However, the
+ // cannon script in CoMI calls this function twice each time
+ // the cannon is reloaded. Unless we update the mouse position
+ // immediately the second call is ignored, causing the cannon
+ // to change its aim.
+
+ set_mouse_pos(x, y);
+ }
}
void OSystem_SDL_Common::set_mouse_cursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y) {
@@ -536,14 +546,14 @@
// Ctrl-z and Alt-X quit
if ((b == KBD_CTRL && ev.key.keysym.sym=='z') || (b == KBD_ALT && ev.key.keysym.sym=='x')) {
event->event_code = EVENT_QUIT;
- return true;;
+ return true;
}
#ifdef MACOSX
// On Macintosh', Cmd-Q quits
if ((ev.key.keysym.mod & KMOD_META) && ev.key.keysym.sym=='q') {
event->event_code = EVENT_QUIT;
- return true;;
+ return true;
}
#endif
// Ctr-Alt-<key> will change the GFX mode
@@ -565,7 +575,7 @@
// quit on fn+backspace on zaurus
if (ev.key.keysym.sym == 127) {
event->event_code = EVENT_QUIT;
- return true;;
+ return true;
}
// map menu key (f11) to f5 (scumm menu)
@@ -812,7 +822,7 @@
case SDL_QUIT:
event->event_code = EVENT_QUIT;
- return true;;
+ return true;
}
}
return false;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.248,1.249
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm charset.cpp,2.44,2.45 gfx.cpp,2.156,2.157 scumm.h,1.249,1.250 string.cpp,1.134,1.135
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list