Merge commit '0e8d3ceacc6b68c11498dd6f6d9ee204d2699a05' into big_experimental

main.lua

@@ -20,9 +20,6 @@ MOBILE = CURRENT_OS == "Android" or CURRENT_OS == "iOS"
 
 LILY = require "libs.lily"
 
----@type table
-local sceneStack -- Only use for checking scene stack, not
-
 function love.load()
     require 'funcs'
     math.randomseed(os.time())
@@ -309,23 +306,12 @@ function love.run()
                     end
                 end
                 love.handlers[name](a,b,c,d,e,f)
-
-                -- Checking for new scene and add it to the end of scene stack
-                if SCENE ~= sceneStack[1] then
-                    table.insert(sceneStack, SCENE)
-                    SCENE = sceneStack[1]
-                end
             end
         end
 
 
         if SCENE and SCENE.update and love.timer then
             SCENE:update()
-            -- Checking for new scene and add it to the end of scene stack
-            if SCENE ~= sceneStack[1] then
-                table.insert(sceneStack, SCENE)
-                SCENE = sceneStack[1]
-            end
 
             local frame_duration = 1.0 / TARGET_FPS
             if time_accumulator < frame_duration then
@@ -346,12 +332,6 @@ function love.run()
             time_accumulator = time_accumulator - frame_duration
         end
         last_time = love.timer.getTime()
-
-        -- Finally, changing to the latest scene in scene stack
-        if #sceneStack > 1 then
-            SCENE = sceneStack[#sceneStack]
-            sceneStack = {SCENE}
-        end
     end
 end
 
@@ -590,6 +570,5 @@ function MainBackground()
         while main_bg_cur_color == main_bg_last_color do main_bg_cur_color = minos[love.math.random(1,7)] end
         main_bg_cur_mino = 1
     end
-    main_bg_placed = false
     main_bg_draw_frame = main_bg_draw_frame + 1
 end

scene/replay.lua

@@ -154,8 +154,8 @@ function ReplaySelectScene:onInputPress(e)
     local selected_replay_text = self.replay_text[self.replay_select + ((self.page-1) * self.page_flip)]
 
     if (
-        e.type == "touch" or e.type == "mouse") and
-        not BUTTON.press(buttonList, e.x, e.y, e.id and
+        (e.type == "touch" or e.type == "mouse") and
+        not BUTTON.press(buttonList, e.x, e.y, e.id) and
         #self.replays > 0
     ) then
         local selection = math.floor((e.y - 15) / 30)

scene/title2.lua

@@ -25,7 +25,7 @@ local main_menu_scenes = {
     DataManagementScene,
     function() love.system.openURL("https://gitea.com/SweetSea-ButImNotSweet/tromi_mobile") end,
     AboutScene,
-    
+
     TrainingScene,
     function() love.system.openURL("https://mycophobia.org/forums/viewtopic.php?t=29") end,
     SettingsScene,
@@ -39,7 +39,7 @@ local main_menu_icons = {
     CHAR.icon.export,
     CHAR.icon.home,
     CHAR.icon.info,
-    
+
     CHAR.icon.toDown,
     CHAR.icon.globe,
     CHAR.icon.settings,
@@ -63,13 +63,13 @@ end
 
 function Title2Scene:render()
     MainBackground()
-    
+
     love.graphics.setColor(0, 0, 0, 0.7)
     love.graphics.rectangle("fill", 30,  60, 580,  85, 10, 10)  -- Tromi
     love.graphics.rectangle("fill", 30, 165, 580, 225, 10, 10)  -- Menu
 
     drawBigText("Tromi", 40, 65, 100, "left")
-    drawText("Mobile 1.1 - PC 2.3", 150, 78, 200, "left")
+    drawText("Mobile 1.4 - PC 2.3", 150, 78, 200, "left")
     drawText("https://mycophobia.org\nhttps://github.com/SweetSea-ButImNotSweet/", 40, 100, 300, "left")
 
     if PENTO_MODE then