thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Sync with ScummVM - rev. 87ebc7140c

Browse source
This commit is contained in:
Bastien Bouclet 2017-09-02 13:27:05 +02:00
parent 0a212398b3
commit 84e62b6c8d
261 changed files with 27464 additions and 13852 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backends/platform/sdl/sdl.cpp
View file

@ -174,6 +174,11 @@ bool OSystem_SDL::hasFeature(Feature f) {
#if SDL_VERSION_ATLEAST(2, 0, 0)
if (f == kFeatureClipboardSupport) return true;
#endif
#ifdef JOY_ANALOG
if (f == kFeatureJoystickDeadzone) return true;
#endif
if (f == kFeatureKbdMouseSpeed) return true;
// ResidualVM specific code:
if (f == kFeatureSideTextures)
return true;
@ -240,6 +245,16 @@ void OSystem_SDL::initBackend() {
_inited = true;
if (!ConfMan.hasKey("kbdmouse_speed")) {
ConfMan.registerDefault("kbdmouse_speed", 3);
ConfMan.setInt("kbdmouse_speed", 3);
}
#ifdef JOY_ANALOG
if (!ConfMan.hasKey("joystick_deadzone")) {
ConfMan.registerDefault("joystick_deadzone", 3);
ConfMan.setInt("joystick_deadzone", 3);
}
#endif
ModularBackend::initBackend();
// We have to initialize the graphics manager before the event manager
@ -474,7 +489,7 @@ Common::String OSystem_SDL::getSystemLanguage() const {
char langName[9];
char ctryName[9];
const LCID languageIdentifier = GetThreadLocale();
const LCID languageIdentifier = GetUserDefaultUILanguage();
if (GetLocaleInfo(languageIdentifier, LOCALE_SISO639LANGNAME, langName, sizeof(langName)) != 0 &&
GetLocaleInfo(languageIdentifier, LOCALE_SISO3166CTRYNAME, ctryName, sizeof(ctryName)) != 0) {
@ -612,3 +627,11 @@ Common::SaveFileManager *OSystem_SDL::getSavefileManager() {
return _savefileManager;
#endif
}
//Not specified in base class
Common::String OSystem_SDL::getScreenshotsPath() {
Common::String path = ConfMan.get("screenshotpath");
if (!path.empty() && !path.hasSuffix("/"))
path += "/";
return path;
}