diff options
-rw-r--r-- | backends/PalmOS/Src/palm.cpp | 7 | ||||
-rw-r--r-- | backends/morphos/morphos_start.cpp | 19 | ||||
-rw-r--r-- | common/scaler.h | 6 | ||||
-rw-r--r-- | common/system.cpp | 4 |
4 files changed, 12 insertions, 24 deletions
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp index 0b7eceb8e6..7f2de9fd3e 100644 --- a/backends/PalmOS/Src/palm.cpp +++ b/backends/PalmOS/Src/palm.cpp @@ -47,6 +47,13 @@ //#define SND_BLOCK (8192) #define SND_BLOCK (3072) +enum { + GFX_FLIPPING = 100, // Palmos + GFX_BUFFERED = 101, // Palmos + GFX_WIDE = 102 // palmos +}; + + OSystem *OSystem_PALMOS_create(int gfx_mode) { return OSystem_PALMOS::create(gfx_mode); } diff --git a/backends/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp index 9cb104fe26..1227506976 100644 --- a/backends/morphos/morphos_start.cpp +++ b/backends/morphos/morphos_start.cpp @@ -71,28 +71,13 @@ Library *TimerBase = NULL; OSystem_MorphOS *TheSystem = NULL; -OSystem *OSystem_MorphOS_create(int gfx_mode, bool full_screen) +OSystem *OSystem_MorphOS_create() { if (TheSystem) delete TheSystem; - SCALERTYPE gfx_scaler = ST_NONE; - switch (gfx_mode) - { - case GFX_DOUBLESIZE: - gfx_scaler = ST_POINT; - break; - - case GFX_SUPEREAGLE: - gfx_scaler = ST_SUPEREAGLE; - break; - - case GFX_SUPER2XSAI: - gfx_scaler = ST_SUPER2XSAI; - break; - } + TheSystem = OSystem_MorphOS::create(ST_NONE, ConfMan.getBool("fullscreen")); - TheSystem = OSystem_MorphOS::create(gfx_scaler, full_screen); return TheSystem; } diff --git a/common/scaler.h b/common/scaler.h index fb427c6fac..ccc57e2d25 100644 --- a/common/scaler.h +++ b/common/scaler.h @@ -70,11 +70,7 @@ enum { GFX_HQ2X = 8, GFX_HQ3X = 9, GFX_TV2X = 10, - GFX_DOTMATRIX = 11, - - GFX_FLIPPING = 100, // Palmos - GFX_BUFFERED = 101, // Palmos - GFX_WIDE = 102 // palmos + GFX_DOTMATRIX = 11 }; diff --git a/common/system.cpp b/common/system.cpp index b9cfb8de8f..75998e3795 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -45,11 +45,11 @@ static OSystem *createSystem() { #elif defined(X11_BACKEND) return OSystem_X11_create(); #elif defined(__MORPHOS__) - return OSystem_MorphOS_create(gfx_mode, ConfMan.getBool("fullscreen")); + return OSystem_MorphOS_create(); #elif defined(_WIN32_WCE) return OSystem_WINCE3_create(); #elif defined(__GP32__) // ph0x - return OSystem_GP32_create(GFX_NORMAL, true); + return OSystem_GP32_create(); #elif defined(__PALM_OS__) //chrilith return OSystem_PALMOS_create(); #else |