aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorKostas Nakos2006-08-18 21:00:41 +0000
committerKostas Nakos2006-08-18 21:00:41 +0000
commit31146e6c0a0900a17e8d5871068345c257212e9f (patch)
tree392370a1362125b404da86c223fe7cbe7b3fba03 /backends
parent0f6d8ab269baa40320ff1cdb7ab5a52b224371c9 (diff)
downloadscummvm-rg350-31146e6c0a0900a17e8d5871068345c257212e9f.tar.gz
scummvm-rg350-31146e6c0a0900a17e8d5871068345c257212e9f.tar.bz2
scummvm-rg350-31146e6c0a0900a17e8d5871068345c257212e9f.zip
fix smartphone cursor hiding when keyboard up, more logical zone function, got rid of higher sound thread priority by default. (backport)
svn-id: r23720
Diffstat (limited to 'backends')
-rw-r--r--backends/platform/wince/wince-sdl.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index f29c3dde96..27894f2e1e 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -532,13 +532,12 @@ void OSystem_WINCE3::switch_zone() {
for (i=0; i<TOTAL_ZONES; i++)
if (x >= _zones[i].x && y >= _zones[i].y &&
- x <= _zones[i].x + _zones[i].width && y <= _zones[i].y + _zones[i].height
- ) {
+ x <= _zones[i].x + _zones[i].width && y <= _zones[i].y + _zones[i].height) {
_mouseXZone[i] = x;
_mouseYZone[i] = y;
break;
}
- _currentZone++;
+ _currentZone = i + 1;
if (_currentZone >= TOTAL_ZONES)
_currentZone = 0;
@@ -697,11 +696,7 @@ bool OSystem_WINCE3::setSoundCallback(SoundProc proc, void *param) {
// Add sound thread priority
if (!ConfMan.hasKey("sound_thread_priority")) {
-#ifdef SH3
thread_priority = THREAD_PRIORITY_NORMAL;
-#else
- thread_priority = THREAD_PRIORITY_ABOVE_NORMAL;
-#endif
}
else
thread_priority = ConfMan.getInt("sound_thread_priority");
@@ -1972,7 +1967,7 @@ void OSystem_WINCE3::hideOverlay() {
void OSystem_WINCE3::drawMouse() {
// FIXME
- if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset()) && !_forceHideMouse)
+ if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset() && !_usesEmulatedMouse) && !_forceHideMouse)
internDrawMouse();
}