From e44a10de2c78a494227e8f6f0a5b2ab9b7d9bf3e Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Fri, 16 Apr 2021 01:30:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/init.lua         | 15 ++++++++++-----
 parts/modes/drought_l.lua   |  2 +-
 parts/modes/sprintMPH.lua   |  2 +-
 parts/modes/sprintPenta.lua |  2 +-
 parts/player/draw.lua       |  4 ++--
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Zframework/init.lua b/Zframework/init.lua
index 52d69656..3eb6b149 100644
--- a/Zframework/init.lua
+++ b/Zframework/init.lua
@@ -461,10 +461,15 @@ local devColor={
 }
 love.draw,love.update=nil--remove default draw/update
 function love.run()
-	local SCN=SCN
-	local SETTING=SETTING
+	local love=love
 
+	local SCN,WIDGET=SCN,WIDGET
+	local VOC,BG,SYSFX=VOC,BG,SYSFX
+	local TASK,LOG,TEXT=TASK,LOG,TEXT
+
+	local SETTING=SETTING
 	local TIME=TIME
+
 	local STEP,WAIT=love.timer.step,love.timer.sleep
 	local FPS=love.timer.getFPS
 	local MINI=love.window.isMinimized
@@ -506,12 +511,12 @@ function love.run()
 		TASK.update()
 		WS.update(dt)
 		VOC.update()
-		BG.update(dt)
+		BG.update(dt)--BG animation
 		SYSFX.update(dt)
 		WIDGET.update()--Widgets animation
-		if SCN.update then SCN.update(dt)end--Scene Updater
+		if SCN.update then SCN.update(dt)end--Scene updater
 		if SCN.swapping then SCN.swapUpdate()end--Scene swapping animation
-		TEXT.update()
+		TEXT.update()--Update global texts animation
 		LOG.update()
 
 		--DRAW
diff --git a/parts/modes/drought_l.lua b/parts/modes/drought_l.lua
index adff9e2d..dbdef6bf 100644
--- a/parts/modes/drought_l.lua
+++ b/parts/modes/drought_l.lua
@@ -7,7 +7,7 @@ return{
 			for _=1,3 do P:getNext(7)end
 			while true do
 				YIELD()
-				if not P.nextQueue[1] then
+				if not P.nextQueue[1]then
 					local height=FREEROW.get(0)
 					local max=#P.field
 					if max>0 then
diff --git a/parts/modes/sprintMPH.lua b/parts/modes/sprintMPH.lua
index b1717e05..d4cecb31 100644
--- a/parts/modes/sprintMPH.lua
+++ b/parts/modes/sprintMPH.lua
@@ -19,7 +19,7 @@ return{
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
 	scoreDisp=function(D)return TIMESTR(D[1]).."   "..D[2].." Pieces"end,
-	comp=function(a,b)return a[1]<b[1]or(a[1]==b[1] and a[2]<b[2])end,
+	comp=function(a,b)return a[1]<b[1]or(a[1]==b[1]and a[2]<b[2])end,
 	getRank=function(P)
 		if P.stat.row<40 then return end
 		local T=P.stat.time
diff --git a/parts/modes/sprintPenta.lua b/parts/modes/sprintPenta.lua
index 6fe29b6e..24628c6c 100644
--- a/parts/modes/sprintPenta.lua
+++ b/parts/modes/sprintPenta.lua
@@ -18,7 +18,7 @@ return{
 	end,
 	score=function(P)return{P.stat.time,P.stat.piece}end,
 	scoreDisp=function(D)return TIMESTR(D[1]).."   "..D[2].." Pieces"end,
-	comp=function(a,b)return a[1]<b[1]or(a[1]==b[1] and a[2]<b[2])end,
+	comp=function(a,b)return a[1]<b[1]or(a[1]==b[1]and a[2]<b[2])end,
 	getRank=function(P)
 		if P.stat.row<40 then return end
 		local T=P.stat.time
diff --git a/parts/player/draw.lua b/parts/player/draw.lua
index ca4fc9eb..b0335fea 100644
--- a/parts/player/draw.lua
+++ b/parts/player/draw.lua
@@ -459,7 +459,7 @@ function draw.drawNext_norm(P)
 				local bk,clr=P.nextQueue[N].bk,P.nextQueue[N].color
 				local k=#bk>2 and 2.2/#bk or 1
 				gc_scale(k)
-				for i=1,#bk do for j=1,#bk[1] do
+				for i=1,#bk do for j=1,#bk[1]do
 					if bk[i][j]then
 						gc_draw(texture[clr],30*(j-#bk[1]*.5)-30,-30*(i-#bk*.5))-- drawCell(i-#bk*.5,j-#bk[1]*.5,clr)
 					end
@@ -497,7 +497,7 @@ function draw.drawNext_hidden(P)
 				local bk,clr=P.nextQueue[N].bk,P.nextQueue[N].color
 				local k=#bk>2 and 2.2/#bk or 1
 				gc_scale(k)
-				for i=1,#bk do for j=1,#bk[1] do
+				for i=1,#bk do for j=1,#bk[1]do
 					if bk[i][j]then
 						gc_draw(texture[clr],30*(j-#bk[1]*.5)-30,-30*(i-#bk*.5))-- drawCell(i-#bk*.5,j-#bk[1]*.5,clr)
 					end