diff --git a/parts/scenes/intro.lua b/parts/scenes/intro.lua index f8b39f7b..83b95eac 100644 --- a/parts/scenes/intro.lua +++ b/parts/scenes/intro.lua @@ -27,7 +27,7 @@ function scene.mouseDown(_,_,k) LOG.print("Old version detected & setting file deleted, please restart the game",600,COLOR.yellow) else if newVersionLaunch then - SCN.push("main","fade") + SCN.push("main") SCN.swapTo("history","fade") LOG.print(text.newVersion,"warn",COLOR.lBlue) else diff --git a/parts/scenes/main.lua b/parts/scenes/main.lua index 863ce847..86dddf21 100644 --- a/parts/scenes/main.lua +++ b/parts/scenes/main.lua @@ -8,7 +8,6 @@ local function tick_httpREQ_checkAccessToken(task) if response then if response.code==200 then LOG.print(text.accessSuccessed) - SCN.pop() SCN.go("netgame") elseif response.code==403 or response.code==401 then httpRequest( diff --git a/parts/tick.lua b/parts/tick.lua index bc4c019e..6b45dcfa 100644 --- a/parts/tick.lua +++ b/parts/tick.lua @@ -11,12 +11,9 @@ function Tick.httpREQ_getAccessToken(task) LOG.print(text.accessSuccessed) ACCOUNT.access_token=res.access_token FILE.save(ACCOUNT,"account","") - SCN.pop() - SCN.go("netgame") + SCN.swapTo("netgame") else LOG.print(text.netErrorCode..response.code..": "..res.message,"warn") - SCN.pop() - SCN.go("main") end else LOGIN=false @@ -28,8 +25,6 @@ function Tick.httpREQ_getAccessToken(task) else LOG.print(text.loginFailed..": "..text.netErrorCode,"warn") end - SCN.pop() - SCN.go("main") end return elseif request_error then