Fix touch buttons that got broken. Also, make the onscreen turbo a pure unthrottle, I don't understand how the other is supposed to work heh (checking iFrameLimit?)

This commit is contained in:
Henrik Rydgard
2013-07-08 00:08:43 +02:00
parent d1cc98c2fc
commit a4e95e5ce9
2 changed files with 17 additions and 17 deletions
+10 -10
View File
@@ -36,7 +36,7 @@ TouchButton buttonStart(&ui_atlas, I_RECT, I_START, PAD_BUTTON_START);
TouchButton buttonLShoulder(&ui_atlas, I_SHOULDER, I_L, PAD_BUTTON_LBUMPER);
TouchButton buttonRShoulder(&ui_atlas, I_SHOULDER, I_R, PAD_BUTTON_RBUMPER, 0, true);
TouchButton buttonTurbo(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_UNTHROTTLE, 180);
TouchButton buttonVPS(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_LEFT_THUMB, 180);
//TouchButton buttonVPS(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_LEFT_THUMB, 180);
TouchCrossPad crossPad(&ui_atlas, I_DIR, I_ARROW);
#if USE_PAUSE_BUTTON
TouchButton buttonPause(&ui_atlas, I_RECT, I_ARROW, PAD_BUTTON_BACK, 90);
@@ -73,9 +73,9 @@ void LayoutGamepad(int w, int h)
crossPad.setPos(leftX + arrow_spacing, leftY, 40, controlScale);
if (g_Config.iFpsLimit)
buttonVPS.setPos(halfW - button_spacing * 2, h - 20 * controlScale, controlScale);
else
//if (g_Config.iFpsLimit)
// buttonVPS.setPos(halfW - button_spacing * 2, h - 20 * controlScale, controlScale);
//else
buttonTurbo.setPos(halfW - button_spacing * 2, h - 20 * controlScale, controlScale);
buttonSelect.setPos(halfW , h - 20 * controlScale, controlScale);
buttonStart.setPos(halfW + button_spacing * 2 , h - 20 * controlScale, controlScale);
@@ -106,9 +106,9 @@ void UpdateGamepad(InputState &input_state)
buttonLShoulder.update(input_state);
buttonRShoulder.update(input_state);
if (g_Config.iFpsLimit)
buttonVPS.update(input_state);
else
//if (g_Config.iFpsLimit)
// buttonVPS.update(input_state);
//else
buttonTurbo.update(input_state);
#if USE_PAUSE_BUTTON
@@ -136,9 +136,9 @@ void DrawGamepad(DrawBuffer &db, float opacity)
buttonLShoulder.draw(db, color, colorOverlay);
buttonRShoulder.draw(db, color, colorOverlay);
if (g_Config.iFpsLimit)
buttonVPS.draw(db, color, colorOverlay);
else
//if (g_Config.iFpsLimit)
// buttonVPS.draw(db, color, colorOverlay);
//else
buttonTurbo.draw(db, color, colorOverlay);
#if USE_PAUSE_BUTTON