From 8b6790187ddeaed7744395483b25713249bc2fe9 Mon Sep 17 00:00:00 2001 From: The Dax Date: Fri, 9 Aug 2013 08:04:13 -0400 Subject: [PATCH] Fix some translation issues and change a variable name(it was supposed to be iSFXVolume, but for some reason it never got changed over). --- Core/Config.cpp | 4 ++-- Core/Config.h | 2 +- Core/HW/SasAudio.cpp | 2 +- UI/GameSettingsScreen.cpp | 4 ++-- UI/MenuScreens.cpp | 18 +++++++++--------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 8607d1f513..28953d0647 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -134,7 +134,7 @@ void Config::Load(const char *iniFileName) sound->Get("Enable", &bEnableSound, true); sound->Get("EnableAtrac3plus", &bEnableAtrac3plus, true); sound->Get("VolumeBGM", &iBGMVolume, 7); - sound->Get("VolumeSFX", &iSEVolume, 7); + sound->Get("VolumeSFX", &iSFXVolume, 7); IniFile::Section *control = iniFile.GetOrCreateSection("Control"); control->Get("ShowStick", &bShowAnalogStick, false); @@ -260,7 +260,7 @@ void Config::Save() sound->Set("Enable", bEnableSound); sound->Set("EnableAtrac3plus", bEnableAtrac3plus); sound->Set("VolumeBGM", iBGMVolume); - sound->Set("VolumeSFX", iSEVolume); + sound->Set("VolumeSFX", iSFXVolume); IniFile::Section *control = iniFile.GetOrCreateSection("Control"); control->Set("ShowStick", bShowAnalogStick); diff --git a/Core/Config.h b/Core/Config.h index 8c6d509901..05905d8b5b 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -98,7 +98,7 @@ public: // Sound bool bEnableSound; bool bEnableAtrac3plus; - int iSEVolume; + int iSFXVolume; int iBGMVolume; // UI diff --git a/Core/HW/SasAudio.cpp b/Core/HW/SasAudio.cpp index c771c684fb..26e1d587fd 100644 --- a/Core/HW/SasAudio.cpp +++ b/Core/HW/SasAudio.cpp @@ -414,7 +414,7 @@ void SasInstance::Mix(u32 outAddr, u32 inAddr, int leftVol, int rightVol) { // Resample to the correct pitch, writing exactly "grainSize" samples. u32 sampleFrac = voice.sampleFrac; const int MAX_CONFIG_VOLUME = 20; - int volumeShift = (MAX_CONFIG_VOLUME - g_Config.iSEVolume); + int volumeShift = (MAX_CONFIG_VOLUME - g_Config.iSFXVolume); if (volumeShift < 0) volumeShift = 0; for (int i = 0; i < grainSize; i++) { // For now: nearest neighbour, not even using the resample history at all. diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index e594805a41..8036e9d5b7 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -259,7 +259,7 @@ void GameSettingsScreen::CreateViews() { audioSettings->Add(new CheckBox(&g_Config.bEnableSound, a->T("Enable Sound"))); audioSettings->Add(new CheckBox(&g_Config.bEnableAtrac3plus, a->T("Enable Atrac3+"))); - audioSettings->Add(new PopupSliderChoice(&g_Config.iSEVolume, 0, 8, a->T("FX volume"), screenManager())); + audioSettings->Add(new PopupSliderChoice(&g_Config.iSFXVolume, 0, 8, a->T("SFX volume"), screenManager())); audioSettings->Add(new PopupSliderChoice(&g_Config.iBGMVolume, 0, 8, a->T("BGM volume"), screenManager())); // Control @@ -336,7 +336,7 @@ void GlobalSettingsScreen::CreateViews() { LinearLayout *list = root_->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f))); list->Add(new ItemHeader("General")); list->Add(new CheckBox(&g_Config.bNewUI, gs->T("Enable New UI"))); - list->Add(new CheckBox(&enableReports_, gs->T("Enable Errors Reporting"))); + list->Add(new CheckBox(&enableReports_, gs->T("Enable Compatibility Server Reports"))); list->Add(new CheckBox(&g_Config.bEnableCheats, gs->T("Enable Cheats"))); list->Add(new CheckBox(&g_Config.bScreenshotsAsPNG, gs->T("Screenshots as PNG"))); list->Add(new Choice(gs->T("System Language")))->OnClick.Handle(this, &GlobalSettingsScreen::OnLanguage); diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index a375a13b93..cdd57d0620 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -873,7 +873,7 @@ void AudioScreen::render() { y+=10; char bgmvol[256]; - sprintf(bgmvol, "%s %i", a->T("BGM Volume :"), g_Config.iBGMVolume); + sprintf(bgmvol, "%s: %i", a->T("BGM Volume"), g_Config.iBGMVolume); ui_draw2d.DrawTextShadow(UBUNTU24, bgmvol, x, y += stride, 0xFFFFFFFF, ALIGN_LEFT); HLinear hlinear1(x + 250, y, 20); if (UIButton(GEN_ID, hlinear1, 80, 0, a->T("Auto"), ALIGN_LEFT)) @@ -885,18 +885,18 @@ void AudioScreen::render() { if (g_Config.iBGMVolume < 8) g_Config.iBGMVolume += 1; y+=20; - char sevol[256]; - sprintf(sevol, "%s %i", a->T("SE Volume :"), g_Config.iSEVolume); - ui_draw2d.DrawTextShadow(UBUNTU24, sevol, x, y += stride, 0xFFFFFFFF, ALIGN_LEFT); + char sfxvol[256]; + sprintf(sfxvol, "%s: %i", a->T("SFX Volume"), g_Config.iSFXVolume); + ui_draw2d.DrawTextShadow(UBUNTU24, sfxvol, x, y += stride, 0xFFFFFFFF, ALIGN_LEFT); HLinear hlinear2(x + 250, y, 20); if (UIButton(GEN_ID, hlinear2, 80, 0, a->T("Auto"), ALIGN_LEFT)) - g_Config.iSEVolume = 3; + g_Config.iSFXVolume = 3; if (UIButton(GEN_ID, hlinear2, 50, 0, a->T("-1"), ALIGN_LEFT)) - if (g_Config.iSEVolume > 1) - g_Config.iSEVolume -= 1; + if (g_Config.iSFXVolume > 1) + g_Config.iSFXVolume -= 1; if (UIButton(GEN_ID, hlinear2, 50, 0, a->T("+1"), ALIGN_LEFT)) - if (g_Config.iSEVolume < 8) - g_Config.iSEVolume += 1; + if (g_Config.iSFXVolume < 8) + g_Config.iSFXVolume += 1; y+=10;