From c53e55d7032178377e9b5d7e9122b0700e4407f8 Mon Sep 17 00:00:00 2001
From: MrZ626 <1046101471@qq.com>
Date: Sat, 1 May 2021 14:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9doGC=E6=A8=A1=E5=9D=97dLine?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Zframework/doGC.lua   |  4 ++--
 parts/scenes/load.lua |  4 ++--
 parts/texture.lua     | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Zframework/doGC.lua b/Zframework/doGC.lua
index 8f8fcb9f..ba1b7a93 100644
--- a/Zframework/doGC.lua
+++ b/Zframework/doGC.lua
@@ -12,13 +12,13 @@ local cmds={
 	setLS="setLineStyle",
 	setLJ="setLineJoin",
 
-	setFT=function(...)setFont(...)end,
+	setFT=setFont,
 	print="print",
 	mText=function(...)ADRAW.str(...)end,
 	mDraw=function(...)ADRAW.draw(...)end,
 
 	draw="draw",
-	dLine="line",
+	line="line",
 	fRect=function(...)gc.rectangle('fill',...)end,
 	dRect=function(...)gc.rectangle('line',...)end,
 	fCirc=function(...)gc.circle('fill',...)end,
diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua
index 65583bec..dc926576 100644
--- a/parts/scenes/load.lua
+++ b/parts/scenes/load.lua
@@ -83,8 +83,8 @@ local loadingThread=coroutine.wrap(function()
 	modeIcons.infinite=DOGC{64,64,
 		{"setLW",4},
 		{"dCirc",32,32,28},
-		{"dLine",32,32,32,14},
-		{"dLine",32,32,41,41},
+		{"line",32,32,32,14},
+		{"line",32,32,41,41},
 		{"move",.5,.5},
 		{"fRect",30,7,4,4},
 		{"fRect",7,30,4,4},
diff --git a/parts/texture.lua b/parts/texture.lua
index f34de195..7401dd91 100644
--- a/parts/texture.lua
+++ b/parts/texture.lua
@@ -46,8 +46,8 @@ TEXTURE.puzzleMark[-1]=DOGC{30,30,
 	{"setCL",1,1,1,.8},
 	{"draw",DOGC{30,30,
 		{"setLW",3},
-		{"dLine",5,5,25,25},
-		{"dLine",5,25,25,5},
+		{"line",5,5,25,25},
+		{"line",5,25,25,5},
 	}}
 }
 
@@ -99,22 +99,22 @@ TEXTURE.setting=DOGC{64,64,
 	{"setLW",8},
 	{"dCirc",32,32,18},
 	{"setLW",10},
-	{"dLine",52,32,64,32},
-	{"dLine",32,52,32,64},
-	{"dLine",12,32,0,32},
-	{"dLine",32,12,32,0},
-	{"dLine",45,45,55,55},
-	{"dLine",19,45,9,55},
-	{"dLine",19,19,9,9},
-	{"dLine",45,19,55,9},
+	{"line",52,32,64,32},
+	{"line",32,52,32,64},
+	{"line",12,32,0,32},
+	{"line",32,12,32,0},
+	{"line",45,45,55,55},
+	{"line",19,45,9,55},
+	{"line",19,19,9,9},
+	{"line",45,19,55,9},
 }
 
 --Earth icon
 TEXTURE.earth=DOGC{64,64,
 	{"setLW",4},
 	{"dCirc",32,32,30},
-	{"dLine",2,31,62,31},
-	{"dLine",31,2,31,62},
+	{"line",2,31,62,31},
+	{"line",31,2,31,62},
 	{"dArc",10,31,40,-.8,.8},
 	{"dArc",53,31,40,2.3,3.9},
 }