The OSystem_SDL::getDefaultGraphicsMode was returning the default for the current graphics manager and not the default for the OSystem_SDL instance. So for example if the default is SDL Surface when starting ScummVM with the gfx_mode not set in the config file, and then the user selects the OpenGL graphics mode, getDefaultGraphicsMode() would now return the OpenGL mode (the default the OpenGLGraphicsManager). As a result changing the graphics mode back to <default> and applying the change would not switch back to Surface SDL until you restart ScummVM or start a game. This commit also change how the SDL backends can specify which graphics mode to use by default. They no longer have to assume they know the names of the graphics modes in the graphics manager.
63 lines
2.1 KiB
C++
63 lines
2.1 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#ifndef PLATFORM_SDL_WIN32_H
|
|
#define PLATFORM_SDL_WIN32_H
|
|
|
|
#include "backends/platform/sdl/sdl.h"
|
|
#include "backends/platform/sdl/win32/win32-window.h"
|
|
|
|
class OSystem_Win32 final : public OSystem_SDL {
|
|
public:
|
|
virtual void init() override;
|
|
virtual void initBackend() override;
|
|
|
|
#ifdef USE_OPENGL
|
|
virtual GraphicsManagerType getDefaultGraphicsManager() const override;
|
|
#endif
|
|
|
|
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0) override;
|
|
|
|
virtual bool hasFeature(Feature f) override;
|
|
|
|
virtual bool displayLogFile() override;
|
|
|
|
virtual bool openUrl(const Common::String &url) override;
|
|
|
|
virtual void logMessage(LogMessageType::Type type, const char *message) override;
|
|
|
|
virtual Common::String getSystemLanguage() const override;
|
|
|
|
virtual Common::String getScreenshotsPath() override;
|
|
|
|
protected:
|
|
virtual Common::String getDefaultConfigFileName() override;
|
|
virtual Common::String getDefaultLogFileName() override;
|
|
|
|
// Override createAudioCDManager() to get our Windows-specific
|
|
// version.
|
|
virtual AudioCDManager *createAudioCDManager() override;
|
|
|
|
HWND getHwnd() { return ((SdlWindow_Win32*)_window)->getHwnd(); }
|
|
};
|
|
|
|
#endif
|