Modify a few menus

desktop_version/src/Editor.cpp

@@ -2653,7 +2653,14 @@ void editorclass::tool_place()
 
 static void creategameoptions(void)
 {
-    game.createmenu(Menu::options);
+    if (key.using_touch)
+    {
+        game.createmenu(Menu::gameplayoptions);
+    }
+    else
+    {
+        game.createmenu(Menu::options);
+    }
 }
 
 static void nextbgcolor(void)

desktop_version/src/Game.cpp

@@ -6608,6 +6608,8 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
     int maxspacing = 30; // maximum value for menuspacing, can only become lower.
     bool auto_buttons = true;
     bool auto_center = true;
+    int button_height = 26;
+    int button_spacing = 6;
     menucountdown = 0;
     menuoptions.clear();
     touch::remove_dynamic_buttons();
@@ -6799,11 +6801,14 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
         menuyoff = -20;
         break;
     case Menu::gameplayoptions:
+    {
 #if !defined(MAKEANDPLAY)
+        int offset = 0;
         if (ingame_titlemode && unlock[Unlock_FLIPMODE])
 #endif
         {
-                option(loc::gettext("flip mode"));
+            option(loc::gettext("flip mode"));
+            offset++;
         }
         option(loc::gettext("toggle fps"));
         option(loc::gettext("speedrun options"));
@@ -6813,28 +6818,48 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
         option(loc::gettext("return"));
         menuyoff = -10;
         maxspacing = 15;
+        auto_buttons = false;
 
-        buttonscentered = true;
+        touch::create_toggle_button((320 - 160) / 2, 120 - 32, 160, 12, loc::gettext("limit to 30 fps"), offset, !over30mode);
+        touch::create_toggle_button((320 - 160) / 2, 120 - 32 + 16, 160, 12, loc::gettext("translucent room name bg"), offset, graphics.translucentroomname);
+
+        touch::create_menu_button(46 - 16, 200, 76, 26, loc::gettext("previous"), -2);
+        touch::create_menu_button(122, 200, 76, 26, loc::gettext("return"), offset + 5);
+        touch::create_menu_button(198 + 16, 200, 76, 26, loc::gettext("next"), -1);
         break;
+    }
     case Menu::graphicoptions:
+    {
+        int optionid = 4;
         if (!gameScreen.isForcedFullscreen())
         {
             option(loc::gettext("toggle fullscreen"));
+            optionid++;
         }
         option(loc::gettext("scaling mode"));
         if (!gameScreen.isForcedFullscreen())
         {
             option(loc::gettext("resize to nearest"), gameScreen.isWindowed);
+            optionid++;
         }
         option(loc::gettext("toggle filter"));
         option(loc::gettext("toggle analogue"));
         option(loc::gettext("toggle vsync"));
         option(loc::gettext("return"));
         menuyoff = -10;
         maxspacing = 15;
+        auto_buttons = false;
 
-        buttonscentered = true;
+        touch::create_menu_button((320 - 160) / 2, 120 - 32, 160, button_height, loc::gettext("scaling mode"), 1);
+        touch::create_toggle_button((320 - 160) / 2, 120 + 16, 160, 12, loc::gettext("filtered screen"), 3, gameScreen.isFiltered);
+        touch::create_toggle_button((320 - 160) / 2, 120 + 32, 160, 12, loc::gettext("analogue mode"), 4, gameScreen.badSignalEffect);
+        touch::create_toggle_button((320 - 160) / 2, 120 + 48, 160, 12, loc::gettext("vsync"), 5, gameScreen.vsync);
+
+        touch::create_menu_button(46 - 16, 200, 76, 26, loc::gettext("previous"), -2);
+        touch::create_menu_button(122, 200, 76, 26, loc::gettext("return"), optionid);
+        touch::create_menu_button(198 + 16, 200, 76, 26, loc::gettext("next"), -1);
         break;
+    }
     case Menu::ed_settings:
         option(loc::gettext("change description"));
         option(loc::gettext("edit scripts"));
@@ -7484,7 +7509,7 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
                 }
             }
 
-            base_y = (240 - count * 32) / 2;
+            base_y = (240 - count * (button_height + button_spacing)) / 2;
         }
 
         int offset = 0;
@@ -7494,9 +7519,9 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
             {
                 touch::create_menu_button(
                     (320 - 160) / 2,
-                    base_y + offset * 32,
+                    base_y + offset * (button_height + button_spacing),
                     160,
-                    26,
+                    button_height,
                     menuoptions[i].text,
                     i,
                     menuoptions[i].active
@@ -7505,6 +7530,8 @@ void Game::createmenu( enum Menu::MenuName t, bool samemenu/*= false*/ )
             }
         }
     }
+
+    touch::on_menu_create();
 }
 
 bool Game::can_unlock_ndm(void)

desktop_version/src/Input.cpp

@@ -454,7 +454,14 @@ void menuactionpress(void)
         case 2:
             //Options
             music.playef(Sound_VIRIDIAN);
-            game.createmenu(Menu::options);
+            if (key.using_touch)
+            {
+                game.createmenu(Menu::gameplayoptions);
+            }
+            else
+            {
+                game.createmenu(Menu::options);
+            }
             map.nexttowercolour();
             break;
         case 3:
@@ -708,6 +715,22 @@ void menuactionpress(void)
             gameScreen.toggleVSync();
             game.savestatsandsettings_menu();
         }
+        if (game.currentmenuoption == -2)
+        {
+            // gameplay menu
+            music.playef(Sound_VIRIDIAN);
+            game.createmenu(Menu::gameplayoptions, true);
+            map.nexttowercolour();
+            processed = true;
+        }
+        if (game.currentmenuoption == -1)
+        {
+            // audio menu
+            music.playef(Sound_VIRIDIAN);
+            game.createmenu(Menu::audiooptions, true);
+            map.nexttowercolour();
+            processed = true;
+        }
         if (!processed)
         {
             //back
@@ -1032,6 +1055,21 @@ void menuactionpress(void)
             map.nexttowercolour();
         }
 
+        if (game.currentmenuoption == -2)
+        {
+            // language menu
+            music.playef(Sound_VIRIDIAN);
+            game.createmenu(Menu::language, true);
+            map.nexttowercolour();
+        }
+        if (game.currentmenuoption == -1)
+        {
+            // graphics menu
+            music.playef(Sound_VIRIDIAN);
+            game.createmenu(Menu::graphicoptions, true);
+            map.nexttowercolour();
+        }
+
         break;
     }
     case Menu::options:
@@ -3370,7 +3408,14 @@ static void mapmenuactionpress(const bool version2_2)
 
         // Set this before we create the menu
         game.kludge_ingametemp = game.currentmenuname;
-        game.createmenu(Menu::options);
+        if (key.using_touch)
+        {
+            game.createmenu(Menu::gameplayoptions);
+        }
+        else
+        {
+            game.createmenu(Menu::options);
+        }
         map.nexttowercolour();
         break;
     case 32: