[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.26,1.27
Nicolas Bacca
arisme at users.sourceforge.net
Sat Mar 26 01:05:09 CET 2005
Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14512
Modified Files:
wince-sdl.cpp
Log Message:
Should fix key mapping issues
Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- wince-sdl.cpp 16 Mar 2005 22:27:11 -0000 1.26
+++ wince-sdl.cpp 26 Mar 2005 09:04:33 -0000 1.27
@@ -987,16 +987,16 @@
// Always use full screen mode to have a "clean screen"
displayWidth = _screenWidth * _scaleFactorXm / _scaleFactorXd;
- displayHeight = _screenHeight * _scaleFactorYm / _scaleFactorYd;
+ displayHeight = _screenHeight * _scaleFactorYm / _scaleFactorYd;
// FIXME
if (!(displayWidth > GetSystemMetrics(SM_CXSCREEN))) { // no rotation
displayWidth = GetSystemMetrics(SM_CXSCREEN);
- displayHeight = GetSystemMetrics(SM_CYSCREEN);
+ displayHeight = GetSystemMetrics(SM_CYSCREEN);
}
_hwscreen = SDL_SetVideoMode(displayWidth, displayHeight, 16, SDL_FULLSCREEN | SDL_SWSURFACE);
- if (_hwscreen == NULL) {
+ if (_hwscreen == NULL) {
// DON'T use error(), as this tries to bring up the debug
// console, which WON'T WORK now that _hwscreen is hosed.
@@ -1014,8 +1014,8 @@
// of a failure, rollback is trivial. Only if everything worked fine
// do we "commit" the changed values to the member vars.
warning("SDL_SetVideoMode says we can't switch to that mode");
- quit();
- }
+ quit();
+ }
//
// Create the surface used for the graphics in 16 bit before scaling, and also the overlay
@@ -1534,7 +1534,7 @@
_keyRepeat = 0;
}
- if (CEActions::Instance()->performMapped(ev.key.keysym.sym, true))
+ if (!CEActions::Instance()->mappingActive() && CEActions::Instance()->performMapped(ev.key.keysym.sym, true))
return true;
}
@@ -1555,7 +1555,7 @@
_lastKeyPressed = 0;
}
- if (CEActions::Instance()->performMapped(ev.key.keysym.sym, false))
+ if (!CEActions::Instance()->mappingActive() && CEActions::Instance()->performMapped(ev.key.keysym.sym, false))
return true;
}
More information about the Scummvm-git-logs
mailing list