[Scummvm-cvs-logs] CVS: scummvm/backends/wince wince-sdl.cpp,1.10,1.11 wince-sdl.h,1.6,1.7
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 28 12:43:07 CEST 2004
Update of /cvsroot/scummvm/scummvm/backends/wince
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31345/backends/wince
Modified Files:
wince-sdl.cpp wince-sdl.h
Log Message:
Remove explicit OSystem parameter from StackLock constructor; added OSystem::displayMessageOnOSD (not yet used; default implementation provided)
Index: wince-sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wince-sdl.cpp 28 Mar 2004 16:30:47 -0000 1.10
+++ wince-sdl.cpp 28 Mar 2004 20:31:17 -0000 1.11
@@ -333,7 +333,7 @@
else
_toolbarHandler.setOffset(400);
- OSystem_SDL_Common::initSize(w, h);
+ OSystem_SDL::initSize(w, h);
update_game_settings();
@@ -623,11 +623,9 @@
}
}
-void OSystem_WINCE3::updateScreen() {
+void OSystem_WINCE3::internUpdateScreen() {
assert(_hwscreen != NULL);
- Common::StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends
-
update_keyboard();
// If the shake position changed, fill the dirty area with blackness
@@ -820,7 +818,7 @@
uint32 OSystem_WINCE3::property(int param, Property *value) {
- Common::StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends
+ Common::StackLock lock(_graphicsMutex); // Lock the mutex until this function ends
if (param == PROP_TOGGLE_FULLSCREEN) {
// FIXME
@@ -898,7 +896,7 @@
bool OSystem_WINCE3::save_screenshot(const char *filename) {
assert(_hwscreen != NULL);
- Common::StackLock lock(_graphicsMutex, this); // Lock the mutex until this function ends
+ Common::StackLock lock(_graphicsMutex); // Lock the mutex until this function ends
SDL_SaveBMP(_hwscreen, filename);
return true;
}
@@ -928,7 +926,7 @@
void OSystem_WINCE3::draw_mouse() {
// FIXME
if (!(_toolbarHandler.visible() && _mouseCurState.y >= _toolbarHandler.getOffset()) && !_forceHideMouse)
- OSystem_SDL_Common::draw_mouse();
+ OSystem_SDL::draw_mouse();
}
void OSystem_WINCE3::fillMouseEvent(Event &event, int x, int y) {
@@ -987,7 +985,7 @@
}
}
- OSystem_SDL_Common::add_dirty_rect(x, y, w, h);
+ OSystem_SDL::add_dirty_rect(x, y, w, h);
}
// FIXME
@@ -1305,5 +1303,5 @@
void OSystem_WINCE3::quit() {
CEDevice::disableHardwareKeyMapping();
- OSystem_SDL_Common::quit();
+ OSystem_SDL::quit();
}
Index: wince-sdl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/wince/wince-sdl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wince-sdl.h 28 Mar 2004 16:30:47 -0000 1.6
+++ wince-sdl.h 28 Mar 2004 20:31:17 -0000 1.7
@@ -36,15 +36,16 @@
#include <SDL.h>
-class OSystem_WINCE3 : public OSystem_SDL_Common {
+class OSystem_WINCE3 : public OSystem_SDL {
public:
OSystem_WINCE3();
// Update the dirty areas of the screen
- void updateScreen();
+ void internUpdateScreen();
- // Set a parameter
- uint32 property(int param, Property *value);
+ bool hasFeature(Feature f);
+ void setFeatureState(Feature f, bool enable);
+ bool getFeatureState(Feature f);
void initSize(uint w, uint h);
More information about the Scummvm-git-logs
mailing list