libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 08:55:45 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SWORD25: Fix locale-related bug when reading the volume settings

Browse Source 
I don't really like this, but I can't think of any better way. It
seems that Lua doesn't like decimal comma at all, so we have to
format the volume settings with a decimal point instead. Otherwise,
all I'll ever get is either full volume or no volume, with nothing
in between.
This commit is contained in:
eriktorbjorn 2011-06-18 18:30:04 +02:00
parent a7234eef81
commit 72aa426770
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
engines/sword25/util/lua/scummvm_file.cpp
View File

@ -32,6 +32,25 @@ Sword25FileProxy::Sword25FileProxy(const Common::String &filename, const Common:
setupConfigFile();
}
Common::String Sword25FileProxy::formatDouble(double value) {
// This is a bit hackish. The point of it is that it's important that
// we ignore the locale decimal mark and force it to be a point. If it
// would happen to be a comma instead, it seems that it's seen as two
// comma-separated integers rather than one floating-point value. Or
// something like that.
bool negative = value < 0.0;
value = fabs(value);
double integerPart = floor(value);
double fractionalPart = (value - integerPart) * 1000000.0;
Common::String out = Common::String::format("%.0f.%.0f", integerPart, fractionalPart);
if (negative)
out = "-" + out;
return out;
}
void Sword25FileProxy::setupConfigFile() {
double sfxVolume = !ConfMan.hasKey("sfx_volume") ? 1.0 : 1.0 * ConfMan.getInt("sfx_volume") / 255.0;
double musicVolume = !ConfMan.hasKey("music_volume") ? 0.5 : 1.0 * ConfMan.getInt("music_volume") / 255.0;
@ -45,10 +64,13 @@ MAX_MEMORY_USAGE = 256000000\r\n\
GFX_VSYNC_ACTIVE = true\r\n\
SFX_SAMPLING_RATE = 44100\r\n\
SFX_CHANNEL_COUNT = 32\r\n\
SFX_SOUND_VOLUME = %f\r\n\
SFX_MUSIC_VOLUME = %f\r\n\
SFX_SPEECH_VOLUME = %f\r\n",
getLanguage().c_str(), subtitles ? "true" : "false", sfxVolume, musicVolume, speechVolume);
SFX_SOUND_VOLUME = %s\r\n\
SFX_MUSIC_VOLUME = %s\r\n\
SFX_SPEECH_VOLUME = %s\r\n",
getLanguage().c_str(), subtitles ? "true" : "false",
formatDouble(sfxVolume).c_str(),
formatDouble(musicVolume).c_str(),
formatDouble(speechVolume).c_str());
_readPos = 0;
}

1
engines/sword25/util/lua/scummvm_file.h
View File

@ -37,6 +37,7 @@ private:
uint _readPos;
Common::String _settings;
Common::String formatDouble(double value);
void setupConfigFile();
Common::String getLanguage();
void setLanguage(const Common::String &lang);