From d4539c3a239cb1a1e98e316db953a6abda6e6527 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Mon, 18 Oct 2021 15:05:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E8=BD=BDSHADER?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.lua            |  8 ++++----
 parts/gameFuncs.lua | 21 +++++++++------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/main.lua b/main.lua
index cb589452..7604c096 100644
--- a/main.lua
+++ b/main.lua
@@ -69,6 +69,10 @@ for _,v in next,{'conf','record','replay','cache','lib'}do
     end
 end
 
+CHAR=require'parts.char'
+require'parts.gameTables'
+require'parts.gameFuncs'
+
 --Load shader files from SOURCE ONLY
 SHADER={}
 for _,v in next,fs.getDirectoryItems('parts/shaders')do
@@ -78,10 +82,6 @@ for _,v in next,fs.getDirectoryItems('parts/shaders')do
     end
 end
 
-CHAR=require'parts.char'
-require'parts.gameTables'
-require'parts.gameFuncs'
-
 FREEROW=    require'parts.freeRow'
 DATA=       require'parts.data'
 
diff --git a/parts/gameFuncs.lua b/parts/gameFuncs.lua
index 29c0198f..c7af099c 100644
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -715,18 +715,15 @@ function drawOnlinePlayerCount()
     gc_printf(("%s: %s/%s/%s"):format(text.onlinePlayerCount,NET.UserCount,NET.PlayCount,NET.StreamCount),-600,80,594,'right')
     gc_pop()
 end
-do--function drawWarning()
-    local shader_warning=SHADER.warning
-    function drawWarning()
-        if SETTING.warn and GAME.warnLVL>0 then
-            gc_push('transform')
-            gc_origin()
-            shader_warning:send('level',GAME.warnLVL)
-            gc_setShader(shader_warning)
-            gc_rectangle('fill',0,0,SCR.w,SCR.h)
-            gc_setShader()
-            gc_pop()
-        end
+function drawWarning()
+    if SETTING.warn and GAME.warnLVL>0 then
+        gc_push('transform')
+        gc_origin()
+        SHADER.warning:send('level',GAME.warnLVL)
+        gc_setShader(SHADER.warning)
+        gc_rectangle('fill',0,0,SCR.w,SCR.h)
+        gc_setShader()
+        gc_pop()
     end
 end