Merge pull request #3310 from raven02/patch-8

Put Save/Load state in [Pause] section
This commit is contained in:
Henrik Rydgård 2013-08-22 01:05:23 -07:00
commit 2394151961
2 changed files with 6 additions and 3 deletions

View File

@ -671,10 +671,10 @@ void GamePauseScreen::CreateViews() {
saveSlots_->SetSelection(g_Config.iCurrentStateSlot);
saveSlots_->OnChoice.Handle(this, &GamePauseScreen::OnStateSelected);
saveStateButton_ = leftColumnItems->Add(new Choice(gs->T("Save State")));
saveStateButton_ = leftColumnItems->Add(new Choice(i->T("Save State")));
saveStateButton_->OnClick.Handle(this, &GamePauseScreen::OnSaveState);
loadStateButton_ = leftColumnItems->Add(new Choice(gs->T("Load State")));
loadStateButton_ = leftColumnItems->Add(new Choice(i->T("Load State")));
loadStateButton_->OnClick.Handle(this, &GamePauseScreen::OnLoadState);
ViewGroup *rightColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(300, FILL_PARENT, actionMenuMargins));

View File

@ -193,7 +193,10 @@ NewLanguageScreen::NewLanguageScreen() : ListPopupScreen("Language") {
if (tempLangs[i].name.find("README") != std::string::npos) {
continue;
}
// Skip ar_AE
if (tempLangs[i].name.find("ar_AE") != std::string::npos) {
continue;
}
FileInfo lang = tempLangs[i];
langs_.push_back(lang);