aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README1
-rw-r--r--backends/sdl/sdl-common.cpp2
-rw-r--r--backends/sdl/sdl.cpp2
-rw-r--r--backends/sdl/sdl_gl.cpp4
-rw-r--r--common/scaler.h6
5 files changed, 8 insertions, 7 deletions
diff --git a/README b/README
index 06d1a88884..5a048f8138 100644
--- a/README
+++ b/README
@@ -468,6 +468,7 @@ simon games.
Keyboard Arrow Keys - Simulate mouse movement
Ctrl-f - Runs in fast mode.
Ctrl-Alt 0-9 - Switch between graphics filters
+ Ctrl-Alt c-d - Switch between other graphics filters
Ctrl-Alt b - Switch between bilinear and non-linear
filtering [OpenGL backend]
Ctrl-Alt a - Toggle aspect-ratio correction on/off.
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp
index 6bb5bd19c7..7a407ad385 100644
--- a/backends/sdl/sdl-common.cpp
+++ b/backends/sdl/sdl-common.cpp
@@ -619,7 +619,7 @@ bool OSystem_SDL_Common::poll_event(Event *event) {
// Ctr-Alt-<key> will change the GFX mode
if (b == (KBD_CTRL|KBD_ALT)) {
- char keys[] = "1234567890";
+ char keys[] = "123456789cd";
char *ptr;
ptr = strchr(keys, ev.key.keysym.sym);
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index 25e5aec488..83490d95d8 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -365,7 +365,7 @@ uint32 OSystem_SDL::property(int param, Property *value) {
#endif
return 1;
} else if (param == PROP_SET_GFX_MODE) {
- if (value->gfx_mode >= 10)
+ if (value->gfx_mode >= 11)
return 0;
_mode = value->gfx_mode;
diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp
index 6c1eaed351..652ecb6a93 100644
--- a/backends/sdl/sdl_gl.cpp
+++ b/backends/sdl/sdl_gl.cpp
@@ -651,8 +651,8 @@ uint32 OSystem_SDL_OpenGL::property(int param, Property *value) {
fb2gl.setBilinearMode(_glBilinearFilter);
break;
default: // SDL backend
- if (value->gfx_mode >= 10)
- return 0;
+ if (value->gfx_mode >= 11)
+ return 0;
_mode = value->gfx_mode;
diff --git a/common/scaler.h b/common/scaler.h
index 73ab6662ed..17618e9cea 100644
--- a/common/scaler.h
+++ b/common/scaler.h
@@ -63,9 +63,9 @@ enum {
GFX_SUPEREAGLE = 5,
GFX_ADVMAME2X = 6,
GFX_ADVMAME3X = 7,
- GFX_TV2X = 8,
- GFX_DOTMATRIX = 9,
- GFX_HQ3X = 10,
+ GFX_HQ3X = 8,
+ GFX_TV2X = 9,
+ GFX_DOTMATRIX = 10,
GFX_BILINEAR = 12, // OpenGL backend