From 6293299f40d927c0c0009daa3a433cdc725244ee Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Fri, 15 Nov 2019 18:51:31 +0000 Subject: BACKENDS: Remove unnecessary implementations of setGraphicsMode(const char *) --- backends/platform/ds/arm9/source/osystem_ds.cpp | 5 ----- backends/platform/ds/arm9/source/osystem_ds.h | 1 - backends/platform/n64/osys_n64.h | 1 - backends/platform/n64/osys_n64_base.cpp | 16 ---------------- backends/platform/psp/display_manager.cpp | 16 ---------------- backends/platform/psp/display_manager.h | 1 - backends/platform/psp/osys_psp.cpp | 7 ------- backends/platform/psp/osys_psp.h | 1 - backends/platform/symbian/src/SymbianOS.cpp | 5 ----- backends/platform/symbian/src/SymbianOS.h | 1 - 10 files changed, 54 deletions(-) diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index c35433d3fc..9abeb59474 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -175,11 +175,6 @@ bool OSystem_DS::setGraphicsMode(int mode) { return true; } -bool OSystem_DS::setGraphicsMode(const char *name) { - consolePrintf("Set gfx mode %s\n", name); - return true; -} - int OSystem_DS::getGraphicsMode() const { return -1; } diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index c8698ca418..c2813d11e4 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -87,7 +87,6 @@ public: virtual const GraphicsMode *getSupportedGraphicsModes() const; virtual int getDefaultGraphicsMode() const; virtual bool setGraphicsMode(int mode); - bool setGraphicsMode(const char *name); virtual int getGraphicsMode() const; virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format); virtual int16 getHeight(); diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h index 80bedbb5ab..75a15b4d17 100644 --- a/backends/platform/n64/osys_n64.h +++ b/backends/platform/n64/osys_n64.h @@ -146,7 +146,6 @@ public: virtual bool getFeatureState(Feature f); virtual const GraphicsMode *getSupportedGraphicsModes() const; virtual int getDefaultGraphicsMode() const; - bool setGraphicsMode(const char *name); virtual bool setGraphicsMode(int mode); virtual int getGraphicsMode() const; virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format); diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp index 2bde28dd62..1ad90cb014 100644 --- a/backends/platform/n64/osys_n64_base.cpp +++ b/backends/platform/n64/osys_n64_base.cpp @@ -224,22 +224,6 @@ int OSystem_N64::getDefaultGraphicsMode() const { return OVERS_NTSC_340X240; } -bool OSystem_N64::setGraphicsMode(const char *mode) { - int i = 0; - while (s_supportedGraphicsModes[i].name) { - if (!scumm_stricmp(s_supportedGraphicsModes[i].name, mode)) { - _graphicMode = s_supportedGraphicsModes[i].id; - - switchGraphicModeId(_graphicMode); - - return true; - } - i++; - } - - return true; -} - bool OSystem_N64::setGraphicsMode(int mode) { _graphicMode = mode; switchGraphicModeId(_graphicMode); diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp index 9643063294..4139ac38d0 100644 --- a/backends/platform/psp/display_manager.cpp +++ b/backends/platform/psp/display_manager.cpp @@ -326,22 +326,6 @@ void DisplayManager::setSizeAndPixelFormat(uint width, uint height, const Graphi calculateScaleParams(); } -bool DisplayManager::setGraphicsMode(const char *name) { - DEBUG_ENTER_FUNC(); - - int i = 0; - - while (_supportedModes[i].name) { - if (!scumm_stricmp(_supportedModes[i].name, name)) { - setGraphicsMode(_supportedModes[i].id); - return true; - } - i++; - } - - return false; -} - bool DisplayManager::setGraphicsMode(int mode) { DEBUG_ENTER_FUNC(); diff --git a/backends/platform/psp/display_manager.h b/backends/platform/psp/display_manager.h index e33328de4b..7de6524216 100644 --- a/backends/platform/psp/display_manager.h +++ b/backends/platform/psp/display_manager.h @@ -116,7 +116,6 @@ public: bool renderAll(); // return true if rendered or nothing dirty. False otherwise void waitUntilRenderFinished(); bool setGraphicsMode(int mode); - bool setGraphicsMode(const char *name); int getGraphicsMode() const { return _graphicsMode; } uint32 getDefaultGraphicsMode() const { return FIT_TO_SCREEN; } const OSystem::GraphicsMode* getSupportedGraphicsModes() const { return _supportedModes; } diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index f456676730..006305c6fd 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -150,13 +150,6 @@ bool OSystem_PSP::setGraphicsMode(int mode) { return _displayManager.setGraphicsMode(mode); } -bool OSystem_PSP::setGraphicsMode(const char *name) { - DEBUG_ENTER_FUNC(); - _displayManager.waitUntilRenderFinished(); - _pendingUpdate = false; - return _displayManager.setGraphicsMode(name); -} - int OSystem_PSP::getGraphicsMode() const { DEBUG_ENTER_FUNC(); return _displayManager.getGraphicsMode(); diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h index 304c724aaa..58354bfbce 100644 --- a/backends/platform/psp/osys_psp.h +++ b/backends/platform/psp/osys_psp.h @@ -77,7 +77,6 @@ public: const GraphicsMode *getSupportedGraphicsModes() const; int getDefaultGraphicsMode() const; bool setGraphicsMode(int mode); - bool setGraphicsMode(const char *name); int getGraphicsMode() const; #ifdef USE_RGB_COLOR virtual Graphics::PixelFormat getScreenFormat() const; diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp index 87e1c09a63..5fa21aed68 100644 --- a/backends/platform/symbian/src/SymbianOS.cpp +++ b/backends/platform/symbian/src/SymbianOS.cpp @@ -161,11 +161,6 @@ void OSystem_SDL_Symbian::checkMappings() { GUI::Actions::Instance()->initInstanceGame(); } -// make sure we always go to normal, even if the string might be set wrong! -bool OSystem_SDL_Symbian::setGraphicsMode(const char * /*name*/) { - return _graphicsManager->setGraphicsMode(0); -} - Common::String OSystem_SDL_Symbian::getDefaultConfigFileName() { char configFile[MAXPATHLEN]; strcpy(configFile, Symbian::GetExecutablePath()); diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h index 479f7fe9e0..ad11433887 100644 --- a/backends/platform/symbian/src/SymbianOS.h +++ b/backends/platform/symbian/src/SymbianOS.h @@ -37,7 +37,6 @@ public: virtual void quit(); virtual void engineInit(); virtual void engineDone(); - virtual bool setGraphicsMode(const char *name); virtual Common::String getDefaultConfigFileName(); virtual bool hasFeature(Feature f); -- cgit v1.2.3