From a38e1f201dd9e6bf12c95e5cf05fb56a9acdfe9f Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 21 Dec 2020 08:37:15 +0800
Subject: [PATCH] =?UTF-8?q?resetGameData=E5=8F=82=E6=95=B0=E6=9B=B4?=
 =?UTF-8?q?=E9=AB=98=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 parts/gametoolfunc.lua  | 7 ++++---
 parts/player/player.lua | 4 ++--
 parts/scenes/pause.lua  | 4 ++--
 parts/scenes/play.lua   | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua
index ccf05e06..cb8b4bd4 100644
--- a/parts/gametoolfunc.lua
+++ b/parts/gametoolfunc.lua
@@ -537,7 +537,8 @@ local function tick_showMods()
 		end
 	end
 end
-function resetGameData(replaying,ifQuick)
+function resetGameData(args)
+	if not args then args=""end
 	if PLAYERS[1]and not GAME.replaying and(GAME.frame>400 or GAME.result)then
 		mergeStat(STAT,PLAYERS[1].stat)
 		STAT.todayTime=STAT.todayTime+PLAYERS[1].stat.time
@@ -546,7 +547,7 @@ function resetGameData(replaying,ifQuick)
 	GAME.result=false
 	GAME.warnLVL0=0
 	GAME.warnLVL=0
-	if replaying then
+	if args:find("r")then
 		GAME.frame=0
 		GAME.recording=false
 		GAME.replaying=1
@@ -566,7 +567,7 @@ function resetGameData(replaying,ifQuick)
 
 	destroyPlayers()
 	GAME.curMode.load()
-	initPlayerPosition(ifQuick)
+	initPlayerPosition(args:find("q"))
 	restoreVirtualKey()
 	if GAME.modeEnv.task then
 		for i=1,#PLAYERS do
diff --git a/parts/player/player.lua b/parts/player/player.lua
index ef2f5792..3cd7737e 100644
--- a/parts/player/player.lua
+++ b/parts/player/player.lua
@@ -1839,9 +1839,9 @@ function Player.act_func(P)
 end
 function Player.act_restart()
 	if GAME.frame<240 then
-		resetGameData(false,true)
+		resetGameData("q")
 	elseif GAME.result then
-		resetGameData(false,false)
+		resetGameData()
 	else
 		LOG.print(text.holdR,20,COLOR.orange)
 	end
diff --git a/parts/scenes/pause.lua b/parts/scenes/pause.lua
index 44709934..7b6cd10f 100644
--- a/parts/scenes/pause.lua
+++ b/parts/scenes/pause.lua
@@ -137,11 +137,11 @@ function scene.keyDown(key)
 		GAME.prevBG=BG.cur
 		SCN.go("setting_sound")
 	elseif key=="r"then
-		resetGameData(false,false)
+		resetGameData()
 		SCN.swapTo("play","none")
 	elseif key=="p"then
 		if(GAME.result or GAME.replaying)and #PLAYERS==1 then
-			resetGameData(true,false)
+			resetGameData("r")
 			SCN.swapTo("play","none")
 		end
 	elseif key=="o"then
diff --git a/parts/scenes/play.lua b/parts/scenes/play.lua
index b7bff34e..b766aadb 100644
--- a/parts/scenes/play.lua
+++ b/parts/scenes/play.lua
@@ -30,7 +30,7 @@ function scene.sceneInit()
 	love.keyboard.setKeyRepeat(false)
 	GAME.restartCount=0
 	if GAME.init then
-		resetGameData(false,false)
+		resetGameData()
 		GAME.init=nil
 	end
 	noKey=GAME.replaying
@@ -204,7 +204,7 @@ function scene.update(dt)
 	elseif P1.keyPressing[10]then
 		GAME.restartCount=GAME.restartCount+1
 		if GAME.restartCount>20 then
-			resetGameData(false,false)
+			resetGameData()
 			return
 		end
 	elseif GAME.restartCount>0 then