From 7cb74bb2947fe34dcc023a1f138630be5089ae2a Mon Sep 17 00:00:00 2001
From: "1304772892@qq.com" <1304772892@qq.com>
Date: Thu, 10 Jan 2019 23:02:04 +0800
Subject: [PATCH] second

---
 Makefile.win           |   8 ++++----
 record.c               |   3 +--
 record.o               | Bin 2585 -> 2557 bytes
 小学生测验.exe    | Bin 144975 -> 144975 bytes
 小学生测验.layout |   6 +++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Makefile.win b/Makefile.win
index 2a0ee1f..aa6758e 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -4,8 +4,8 @@
 CPP      = g++.exe
 CC       = gcc.exe
 WINDRES  = windres.exe
-OBJ      = main.o test.o record.o load.o ../pupil_test/save.o setting.o
-LINKOBJ  = main.o test.o record.o load.o ../pupil_test/save.o setting.o
+OBJ      = main.o test.o record.o load.o save.o setting.o
+LINKOBJ  = main.o test.o record.o load.o save.o setting.o
 LIBS     = -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib" -L"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/lib" -static-libgcc
 INCS     = -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include"
 CXXINCS  = -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/x86_64-w64-mingw32/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include" -I"C:/Program Files (x86)/Dev-Cpp/MinGW64/lib/gcc/x86_64-w64-mingw32/4.9.2/include/c++"
@@ -36,8 +36,8 @@ record.o: record.c
 load.o: load.c
 	$(CC) -c load.c -o load.o $(CFLAGS)
 
-../pupil_test/save.o: ../pupil_test/save.c
-	$(CC) -c ../pupil_test/save.c -o ../pupil_test/save.o $(CFLAGS)
+save.o: save.c
+	$(CC) -c save.c -o save.o $(CFLAGS)
 
 setting.o: setting.c
 	$(CC) -c setting.c -o setting.o $(CFLAGS)
diff --git a/record.c b/record.c
index cccaa2e..39c7a4f 100644
--- a/record.c
+++ b/record.c
@@ -13,8 +13,7 @@ record(int v){
 		printf("\t\t\t%2d.  %-5s  %3d��  %5.2f��\n\n",i+1,dates[dif][i].name,dates[dif][i].scores,dates[dif][i].time);
 	}
 	
-	printf("\t\t\t����������ز˵�");
-	getch();		if(voice==1) printf("\a");
+	system("pause");		if(voice==1) printf("\a");
 	system("cls");
 		
 }
diff --git a/record.o b/record.o
index bee1ecffa6a6cbf166ac0698a304c784f95f0308..88fd62eabb100bad3ce04a1e51effa6686b2a11d 100644
GIT binary patch
delta 217
zcmbO!@>iHQrHzLH1Rk(5FlbHWRcDl%Xu6+q!o;usjO!-5GOAB@VHBKP%P7uxX!2Ab
zZwioi7RbA{`6**I<K$3gX~w+Ch0MZ}>zQ*k3ld9<QyG$Tioqr#2u2QOR*oVTX2t-B
zSleb%7GFk9Wgw4*A)b+eK>^Gv0J2oTta2br1k9=dvXm!JWmRWY1@ajuZ)erq{EC&2
ik+lsdAvO6gTRLOW<W%<GlUq21CKquCZJx%_%m@HCcrKCv

delta 244
zcmew>JX3@>rHzLH1YWT+FlbNYRcDl*Xu6+q*2J&=j5{W~GOACW!YDYomQkGX%;c#+
z-V;WF$!8cP7$0nY%9zbK*_&B`zXquL1;_}G<|7WVhbPxF=W23ta&Fji;@qW2d;V<S
zy8Fha(_5D^B<B<}Fmf=naul&JGX{V(Ffep)7G?2eG*$#MSr}p&85oqotP~(i0n91|
zvQ)sV8X!vq%xVO(R3~?{s!!g-sseO21B2G)+pNNjtldBf>B*nj(is~jN3;KCOHVCH
U&S01v!yz|0j6-O16-P580MYC|#{d8T

diff --git a/小学生测验.exe b/小学生测验.exe
index 64897d4968ace50b6842bfa07b3edaee89f10d52..2daa242c4982593b50e69d9857daa0673e602295 100644
GIT binary patch
delta 149
zcmX^AhU5GjjtL#ijB(}@yM3A0urqJGT`OViBhA3z(arkSg@K`)q4@`6Dc4SR1_p)~
zIw0|0USoS8TLZ*yKH?C2cmfD)?v|8Q7B5IFEly=f&M5|}Mgp7n+brc~Y->*S*q-Xa
lsGQ2$#>l`RH9c?@W9;--YZ<v1i>4pk$SAp;Zylp!2LQIPErS36

delta 145
zcmX^AhU5GjjtL#i^EMhy?Dl0|u#9Qr?OF+A6KMv97v@01qnq`G3j;$pL-P;DQm&os
z3_x*pka#bzjXjX93}QDQafm&<xm!|JS)7xTbHkPs=Po_k^Jn|k-8VL!-nx__Ij4B@
uew(G-jNQ$t9@|qr7?o2QyQllEVoaR=YAqudW5e`=8yO|H^Q~ia>;M2`MK^u`

diff --git a/小学生测验.layout b/小学生测验.layout
index 406cda8..40d16c1 100644
--- a/小学生测验.layout
+++ b/小学生测验.layout
@@ -1,6 +1,6 @@
 [Editors]
 Order=0,1,3,4,5,6,2
-Focused=2
+Focused=3
 [Editor_0]
 CursorCol=4
 CursorRow=38
@@ -9,7 +9,7 @@ LeftChar=1
 [Editor_1]
 CursorCol=24
 CursorRow=124
-TopLine=154
+TopLine=145
 LeftChar=1
 [Editor_2]
 CursorCol=13
@@ -18,7 +18,7 @@ TopLine=1
 LeftChar=1
 [Editor_3]
 CursorCol=2
-CursorRow=9
+CursorRow=15
 TopLine=1
 LeftChar=1
 [Editor_4]