aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2003-11-04 20:46:20 +0000
committerMax Horn2003-11-04 20:46:20 +0000
commit74b496a0627517f0c4231c4f77209dbf331c9dcb (patch)
tree0535f6d2ad06b24e262c43bff1169c32d8aed253
parent6a6644bac8685cb448042bbc12c831bab61fa7de (diff)
downloadscummvm-rg350-74b496a0627517f0c4231c4f77209dbf331c9dcb.tar.gz
scummvm-rg350-74b496a0627517f0c4231c4f77209dbf331c9dcb.tar.bz2
scummvm-rg350-74b496a0627517f0c4231c4f77209dbf331c9dcb.zip
added PROP_GET_GFX_MODE; removed PROP_SHOW_DEFAULT_CURSOR
svn-id: r11132
-rw-r--r--backends/gp32/gp32.cpp4
-rw-r--r--backends/morphos/morphos.cpp8
-rw-r--r--backends/sdl/sdl-common.cpp9
-rw-r--r--backends/wince/wince.cpp3
-rw-r--r--common/system.h20
5 files changed, 14 insertions, 30 deletions
diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp
index 5eba66274a..fabd2e37e8 100644
--- a/backends/gp32/gp32.cpp
+++ b/backends/gp32/gp32.cpp
@@ -1047,10 +1047,6 @@ uint32 OSystem_GP32::property(int param, Property *value) {
return 1;
- case PROP_SHOW_DEFAULT_CURSOR:
- ///SDL_ShowCursor(value->show_cursor ? SDL_ENABLE : SDL_DISABLE); //fixme?
- break;
-
case PROP_GET_SAMPLE_RATE:
///return SAMPLES_PER_SEC; //ph0x fixme
return 22050;
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index c98a8d305d..2482d5e274 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -448,14 +448,6 @@ uint32 OSystem_MorphOS::property(int param, Property *value)
break;
}
- case PROP_SHOW_DEFAULT_CURSOR:
- if (value->show_cursor)
- ClearPointer(ScummWindow);
- else
- SetPointer(ScummWindow, ScummNoCursor, 1, 1, 0, 0);
- ScummOrigMouse = ScummDefaultMouse = value->show_cursor;
- break;
-
case PROP_GET_SAMPLE_RATE:
return SAMPLES_PER_SEC;
}
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index d5aff962b5..ed6669f069 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -1003,6 +1003,9 @@ uint32 OSystem_SDL_Common::property(int param, Property *value) {
case PROP_GET_FULLSCREEN:
return _full_screen;
+ case PROP_GET_GFX_MODE:
+ return _mode;
+
case PROP_SET_WINDOW_CAPTION:
SDL_WM_SetCaption(value->caption, value->caption);
return 1;
@@ -1012,7 +1015,7 @@ uint32 OSystem_SDL_Common::property(int param, Property *value) {
_cdrom = NULL;
else {
_cdrom = SDL_CDOpen(value->cd_num);
- /* Did if open? Check if _cdrom is NULL */
+ // Did it open? Check if _cdrom is NULL
if (!_cdrom) {
warning("Couldn't open drive: %s", SDL_GetError());
} else {
@@ -1023,10 +1026,6 @@ uint32 OSystem_SDL_Common::property(int param, Property *value) {
}
break;
- case PROP_SHOW_DEFAULT_CURSOR:
- SDL_ShowCursor(value->show_cursor ? SDL_ENABLE : SDL_DISABLE);
- break;
-
case PROP_GET_SAMPLE_RATE:
return SAMPLES_PER_SEC;
}
diff --git a/backends/wince/wince.cpp b/backends/wince/wince.cpp
index 20e86811d5..6af898c5c4 100644
--- a/backends/wince/wince.cpp
+++ b/backends/wince/wince.cpp
@@ -1789,9 +1789,6 @@ uint32 OSystem_WINCE3::property(int param, Property *value) {
case PROP_SET_GFX_MODE:
return 1;
- case PROP_SHOW_DEFAULT_CURSOR:
- break;
-
case PROP_GET_SAMPLE_RATE:
return (new_audio_rate ? SAMPLES_PER_SEC_NEW : SAMPLES_PER_SEC_OLD);
diff --git a/common/system.h b/common/system.h
index 9350830d91..bac63a8950 100644
--- a/common/system.h
+++ b/common/system.h
@@ -89,16 +89,16 @@ public:
enum {
PROP_TOGGLE_FULLSCREEN = 1,
- PROP_SET_WINDOW_CAPTION = 2,
- PROP_OPEN_CD = 3,
- PROP_SET_GFX_MODE = 4,
- PROP_SHOW_DEFAULT_CURSOR = 5,
- PROP_GET_SAMPLE_RATE = 6,
- PROP_GET_FULLSCREEN = 7,
- PROP_GET_FMOPL_ENV_BITS = 8,
- PROP_GET_FMOPL_EG_ENT = 9,
- PROP_TOGGLE_ASPECT_RATIO = 10,
- PROP_WANT_RECT_OPTIM = 11
+ PROP_SET_WINDOW_CAPTION,
+ PROP_OPEN_CD,
+ PROP_SET_GFX_MODE,
+ PROP_GET_GFX_MODE,
+ PROP_GET_SAMPLE_RATE,
+ PROP_GET_FULLSCREEN,
+ PROP_GET_FMOPL_ENV_BITS,
+ PROP_GET_FMOPL_EG_ENT,
+ PROP_TOGGLE_ASPECT_RATIO,
+ PROP_WANT_RECT_OPTIM
};
union Property {
const char *caption;