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

GUI: U32: Code cleanup & misc fixes

Browse source 
- Fix a translation for scumm subtitle settings dialogs.
This commit is contained in:
aryanrawlani28 2020-08-20 11:45:58 +05:30 • committed by Eugene Sandulenko
parent edec55cf64
commit 840f08d537
5 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/bbvs/dialogs.cpp
View file

@ -86,11 +86,11 @@ MainMenu::~MainMenu() {
}
void MainMenu::init() {
_buttons[0] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""), Common::U32String(""), 0);
_buttons[1] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""), Common::U32String(""), 0);
_buttons[2] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""), Common::U32String(""), 0);
_buttons[3] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""), Common::U32String(""), 0);
_buttons[4] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""), Common::U32String(""), 0);
_buttons[0] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""));
_buttons[1] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""));
_buttons[2] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""));
_buttons[3] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""));
_buttons[4] = new GUI::ButtonWidget(this, 0, 0, 1, 1, Common::U32String(""));
gotoMenuScreen(kMainMenuScr);
}

3
engines/cryomni3d/versailles/logic.cpp
View file

@ -2417,10 +2417,9 @@ bool CryOmni3DEngine_Versailles::handleEpigraph(ZonFixedImage *fimg) {
if (password.size() >= kEpigraphMaxLetters) {
continue;
}
char keyCodeCheck = keyCode - Common::KEYCODE_a + 'A';
if (keyCode >= Common::KEYCODE_a &&
keyCode <= Common::KEYCODE_z &&
_epigraphContent.contains(keyCodeCheck)) {
_epigraphContent.contains((char)(keyCode - Common::KEYCODE_a + 'A'))) {
password += keyCode - Common::KEYCODE_a + 'A';
} else {
continue;

3
engines/engine.cpp
View file

@ -316,8 +316,7 @@ void initGraphics(int width, int height, const Graphics::PixelFormat *format) {
// Error out on size switch failure
if (gfxError & OSystem::kTransactionSizeChangeFailed) {
Common::U32String message;
message = Common::U32String::format(
_("Could not switch to resolution '%dx%d'."), width, height);
message = Common::U32String::format(_("Could not switch to resolution '%dx%d'."), width, height);
GUIErrorMessage(message);
error("Could not switch to resolution '%dx%d'.", width, height);

18
engines/hugo/dialogs.cpp
View file

@ -56,15 +56,15 @@ void TopMenu::init() {
int x = kMenuX;
int y = kMenuY;
_whatButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("What is it?"), kCmdWhat);
_musicButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Music"), kCmdMusic);
_soundFXButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Sound FX"), kCmdSoundFX);
_saveButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Save game"), kCmdSave);
_loadButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Load game"), kCmdLoad);
_recallButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Recall last command"), kCmdRecall);
_turboButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Turbo"), kCmdTurbo);
_lookButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Description of the scene"), kCmdLook);
_inventButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Inventory"), kCmdInvent);
_whatButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("What is it?"), kCmdWhat);
_musicButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Music"), kCmdMusic);
_soundFXButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Sound FX"), kCmdSoundFX);
_saveButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Save game"), kCmdSave);
_loadButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Load game"), kCmdLoad);
_recallButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Recall last command"), kCmdRecall);
_turboButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Turbo"), kCmdTurbo);
_lookButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Description of the scene"), kCmdLook);
_inventButton = new GUI::PicButtonWidget(this, x, y, kButtonWidth, kButtonHeight, Common::U32String("Inventory"), kCmdInvent);
}
void TopMenu::reflowLayout() {

2
engines/scumm/dialogs.cpp
View file

@ -609,7 +609,7 @@ void SubtitleSettingsDialog::cycleValue() {
_value = 0;
if (_value == 1 && g_system->getOverlayWidth() <= 320)
setInfoText(Common::U32String(_sc("Speech & Subs", "lowres")));
setInfoText(_c("Speech & Subs", "lowres"));
else
setInfoText(_(subtitleDesc[_value]));