Merge branch 'bhavin192-patch-1'

This commit is contained in:
Henrik Rydgård 2013-10-29 10:06:38 +01:00
commit dbbd7c0137
2 changed files with 4 additions and 1 deletions

View File

@ -215,7 +215,7 @@ void GameSettingsScreen::CreateViews() {
controlsSettings->Add(new ItemHeader(ms->T("Controls")));
controlsSettings->Add(new Choice(c->T("Control Mapping")))->OnClick.Handle(this, &GameSettingsScreen::OnControlMapping);
#ifdef USING_GLES2
#if defined(USING_GLES2)
controlsSettings->Add(new CheckBox(&g_Config.bHapticFeedback, c->T("HapticFeedback", "Haptic Feedback (vibration)")));
controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)")));
Choice *tiltAnalog = controlsSettings->Add(new Choice(c->T("Customize tilt")));

View File

@ -24,6 +24,7 @@ void TiltAnalogSettingsScreen::CreateViews() {
using namespace UI;
I18NCategory *c = GetI18NCategory("Controls");
I18NCategory *d = GetI18NCategory("Dialog");
root_ = new ScrollView(ORIENT_VERTICAL);
@ -49,6 +50,8 @@ void TiltAnalogSettingsScreen::CreateViews() {
settings->Add(calibrate);
root_->Add(settings);
settings->Add(new ItemHeader(""));
settings->Add(new Choice(d->T("Back")))->OnClick.Handle<UIScreen>(this, &UIScreen::OnBack);
}
void TiltAnalogSettingsScreen::update(InputState &input) {