From 1438fee45dda283a6d709f41018628ddca771e46 Mon Sep 17 00:00:00 2001
From: TcMcKrLiTb <3161371343@qq.com>
Date: Wed, 16 Nov 2022 14:34:05 +0800
Subject: [PATCH] 2.0!

---
 MineSweeper/Gaming.cpp      | 126 ++++++++++++++++++++++++++++++------
 MineSweeper/Gaming.h        |   7 +-
 MineSweeper/MineSweeper.aps | Bin 81460 -> 82456 bytes
 MineSweeper/MineSweeper.cpp | 115 ++++++++++++++++++++++++++++++--
 MineSweeper/MineSweeper.rc  | Bin 11846 -> 14286 bytes
 MineSweeper/Themap.cpp      |  49 ++++++++++++--
 MineSweeper/Themap.h        |   1 +
 MineSweeper/resource.h      |  16 ++++-
 README.md                   |  18 ++++++
 9 files changed, 295 insertions(+), 37 deletions(-)

diff --git a/MineSweeper/Gaming.cpp b/MineSweeper/Gaming.cpp
index a2e4768..a107798 100644
--- a/MineSweeper/Gaming.cpp
+++ b/MineSweeper/Gaming.cpp
@@ -12,13 +12,15 @@ HBITMAP g_hbmBlo[14] = { NULL };
 HBITMAP g_hbmBut[4] = { NULL };
 HANDLE hHandle = NULL;
 HANDLE TimerID_1s = NULL;
-int allNums[7];
 _Blocks game_map;
+int allNums[7];
+int __ROW__ = 10, __COL__ = 10, __MINE__ = 10;
 void MapPainting(HWND hwnd)
 {
 	PAINTSTRUCT ps;
 	HDC hdc = BeginPaint(hwnd, &ps);
 	HDC hdcMem = CreateCompatibleDC(hdc);
+	GetNums();
 	ButPainting(&ps, &hdc, &hdcMem, game_map.game_state);
 	NumPainting(&ps, &hdc, &hdcMem, ((game_map.size_col) * 25) - 39, allNums[1], allNums[2], allNums[3], allNums[4], allNums[5], allNums[6]);
 	//Sleep(1000);
@@ -138,6 +140,34 @@ void ReSizeGameWnd(HWND hwnd)
 		TRUE);
 }
 
+void InttoStr(int x, wchar_t* str)
+{
+	int i = 0;
+	while (x)
+	{
+		str[i] = (x % 10) + '0';
+		x /= 10;
+		i++;
+	}
+	for (int j = 0; j < i / 2; j++)
+	{
+		wchar_t t = str[j];
+		str[j] = str[i - j - 1];
+		str[i - j - 1] = t;
+	}
+}
+
+void StrtoInt(int* x, wchar_t* str)
+{
+	int len = 0;
+	*x = 0;
+	while (str[len++] != 0);
+	for (int i = 0; i < len - 1; i++) {
+		*x *= 10;
+		*x += str[i] - '0';
+	}
+}
+
 void InitNUMPADs()
 {
 	g_hbmNum[0] = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE(164));
@@ -148,7 +178,7 @@ void InitNUMPADs()
 void InitBLOCKs()
 {
 	game_map.game_state = 0;
-	game_map.InitBox(10, 10);
+	game_map.InitBox(__ROW__, __COL__);
 	for (int i = 1; i <= 13; i++)
 		g_hbmBlo[i] = LoadBitmap(GetModuleHandle(NULL), MAKEINTRESOURCE((int)(173 + i) - 1));
 }
@@ -161,7 +191,6 @@ void GameOver(bool winorlose) {
 		if (Result) {
 			;
 		}
-
 	}
 	else
 	{
@@ -183,6 +212,44 @@ void GameOver(bool winorlose) {
 	}
 }
 
+void GameRestart()
+{
+	if (TimerID_1s != NULL)
+	{
+		if (game_map.game_state == 1)
+		{
+			BOOL Result = DeleteTimerQueueTimer(hHandle, TimerID_1s, NULL);
+			if (Result) {
+				;
+			}
+		}
+	}
+	game_map.time_now = 0;
+	GetNums();
+	game_map.game_state = 0;
+	game_map.InitBox(__ROW__, __COL__);
+	return;
+}
+
+void JudgeNum(int* x, int choose)
+{
+	switch (choose)
+	{
+	case 1:
+		*x = *x < 1 ? 1 : *x;
+		*x = *x > 34 ? 34 : *x;
+		break;
+	case 2:
+		*x = *x < 4 ? 4 : *x;
+		*x = *x > 60 ? 60 : *x;
+		break;
+	case 3:
+		*x = *x < 1 ? 1 : *x;
+		*x = *x > ((__ROW__ * __COL__) - 1) ? ((__ROW__ * __COL__) - 1) : *x;
+		break;
+	}
+}
+
 void GetNums() {
 	int num1 = game_map.Bombnum();
 	int num2 = game_map.time_now;
@@ -193,6 +260,30 @@ void GetNums() {
 	}
 }
 
+void SetGame(int row, int col, int mine)
+{
+	__ROW__ = row;
+	__COL__ = col;
+	__MINE__ = mine;
+	return;
+}
+
+int GetGame(int choose)
+{
+	switch (choose)
+	{
+	case 1:
+		return __ROW__;
+		break;
+	case 2:
+		return __COL__;
+		break;
+	case 3:
+		return __MINE__;
+		break;
+	}
+}
+
 VOID CALLBACK TimerRoutine(PVOID lpParam, BOOLEAN TimerOrWaitFired) {
 	game_map.time_now++;
 	GetNums();
@@ -233,7 +324,7 @@ void Lclick(int x, int y, HWND hwnd)
 		if (game_map.game_state == 0)
 		{
 			GameStart(hwnd);
-			game_map.RandomSetMines(x, y, 10);
+			game_map.RandomSetMines(x, y, __MINE__);
 		}
 		if (game_map._vis[x][y] == false)
 		{
@@ -257,7 +348,16 @@ void Lclick(int x, int y, HWND hwnd)
 				game_map._vis[x][y] = true;
 			}
 		}
-		if (game_map.JudgeisWin() == true) {
+		if (game_map.JudgeisWin() == true) 
+		{
+			for (int i = 1; i <= game_map.size_row; i++)
+			{
+				for (int j = 1; j <= game_map.size_col; j++)
+				{
+					if (game_map._Block[i][j] == -1)
+						game_map._flag[i][j] = true;
+				}
+			}
 			GameOver(true);
 		}
 	}
@@ -265,21 +365,7 @@ void Lclick(int x, int y, HWND hwnd)
 	{
 		if (y > (10 + (25 * (game_map.size_col + 1))) / 2 - 23 && y < (10 + (25 * (game_map.size_col + 1))) / 2 + 22)
 		{
-			if (TimerID_1s != NULL)
-			{
-				if (game_map.game_state == 1)
-				{
-					BOOL Result = DeleteTimerQueueTimer(hHandle, TimerID_1s, NULL);
-					if (Result) {
-						;
-					}
-				}
-			}
-			game_map.time_now = 0;
-			GetNums();
-			game_map.game_state = 0;
-			game_map.InitBox(10, 10);
-
+			GameRestart();
 		}
 	}
 }
diff --git a/MineSweeper/Gaming.h b/MineSweeper/Gaming.h
index add4461..7ad66b3 100644
--- a/MineSweeper/Gaming.h
+++ b/MineSweeper/Gaming.h
@@ -9,7 +9,12 @@ void InitBLOCKs();
 void Lclick(int x, int y, HWND hwnd);
 void Rclick(int x, int y, HWND hwnd);
 void GetNums();
+void SetGame(int row, int col, int mine);
 void GameOver(bool winorlose);
+void GameRestart();
+void JudgeNum(int* x, int choose);
 void GameStart(HWND hwnd);
 void ReSizeGameWnd(HWND hwnd);
-void ReSizeFameWnd(HWND hwnd);
\ No newline at end of file
+void InttoStr(int x, wchar_t* str);
+void StrtoInt(int* x, wchar_t* str);
+int GetGame(int choose);
\ No newline at end of file
diff --git a/MineSweeper/MineSweeper.aps b/MineSweeper/MineSweeper.aps
index 5e117ae519ff4f3875d96e4c1402205b1ae261bf..3547521100b181325d5853f7eae6709483cb5019 100644
GIT binary patch
delta 2418
zcmZ`)ZETZO6h61@3hTDE`)b#Zbz^P}fkC^kb_1tlEz7cgvAzr((-IIFGA1ENA|b9b
z{2=~N^dPq@UrR7zln`KqknuIhBnx7~A2lram1trNQGSqM7IdEbzU}sc@lD=7=Y5`Y
z?>*<-drvPs(Ixk19rSB`D;N%$TIK`5V=X`>zu{$N=T1M;42I(2z`FL<Pyp&`y<Q(I
z0qF3D;;RDf9pP}GORzpSELGT0z~9j-$*#Uys8Ptk`e>j_k{#<{nc&*uF{xGRXoDIL
zEC-0UMq}}CBpzDb1|De05P|hlybHh57O+PAxwKU0s|PRMC@o_?EYmqz)96awQazg(
z-DX(K>N7za5>G{!D}QFfGRj}+cuWcWAZLKJ;XgS$Smb1XF2n6c1MbP|#BpOb-p&iM
zBwCFUOJToJ!s{jj-Zpl!<7hESYy`KPB)n$M#z|9<eS*biiG7N1m?gZLZ@@`&C;J?W
z@+Ec}x8+NCr63z`<p<eWEG&@NdF(5Y@N%I6ZxwW+xyXQy!cKMxw-!ol46hVQXe`b~
zTTzf*!`F)>HjbBzV(ccGieqd7Hy6jUZ$Tx@%rsIt)>PQ>Uh#Jf@tozof(Gz3HBx>3
zaoUDpq}>B}HP<@YWz}gkhqAE8R<Y<M=#Is^16{F>NI2dRULB!|GqER;PGM>2Ba2==
zj@VpTOt!Auj<PE3wR8F{*E!JSs2R+m5v$_iwV`OMzZN_VjX<spa#eI4(O!klQ_=NA
z`xM%!qAB!-CWSVs=tl4~x)s{2qVcjLrzBrR_{gtT@hiX|9F|uKRic~3dPOYC(5r$G
z4|u$F3SF$CDIIUx+oGZ=9WNbCk);*aI4vb5Dv_f1rgOF7pwlvFSBYK{)2TUBG=)qT
zN1o6r(-cx$XN;oqc@(--MN?FCqhxQFil(T1=^V;bbS_nyu8Ztmj^(A6o&~ZRj&y}u
zgLF#LW1f@Qb;?clG^IyW$ZRkYi_!h|G^MkyBzEp#iG!v|pAW5*dGT;*O|iJy)Bz;Q
z!R^lIAL*QfbUc)MFH}m!?e?Ze)1=B6%EayV&9Tq+9XS^*x&Np4sFch_7fmT$Eit4m
z6o0A-&5no*$9lOnrE^zSXj>bTA|aViXRpN{wN96BHj%jo1{%=Ooza4R)Ztq5HnoNw
zylR7Qz_e)*EQEG=UgQpj#Mvzwt}D&S0_2j?xk=c@L{0eAJHj$03d0vS2rEDF`%r2_
zM|c@^PU@ZF!DIYQwh!}?A8P1hBw5L7@yp}_@$p--M}U90yA-HHyi4zPc}zdu@p7_e
zX0qs=Ku6M1sewB%o)9e`;3#a9QCY0|Wm7M}d^pIkKk3ZZ%aZt^4UaAb39Z9rgDkok
zB&Y==6+ld!fNx_5cFejGn<yWOz6d2yM}6TB`d68m8Jd%4^=euF^MCb5S%3JfJ}6J6
ziB^FfY+#_tm5hT2c5bngEzaBAYMSUmDtd{^&)SvoqpW5hO|%-Cp7MKqIO7)$Tp~X)
zsUHG>7lwURO6H=ZTR}&aq`yH}O>er)GPeu=9uA={Www1xig>bg0P_?R=8?S#Yf`17
z!PKH-><WL&%i7sve$~sWHIq8**17Z(IRHNyaKPZw@1|js7Iax$dZfiSTJa*8hq3@l
z?D(q9rSGHp?v(MAkGV8bB_9)bw1H0v+}+Ek1wPrx?M;OKUA$RfWiRg$cqhsCHZi+?
zgcflQ^OWH35A!j>?V}>)ruY=u3&mmj?8sb}A{Dn;<gYxUOzV%~nc)^aMGpSsyrr4d
zYWB<M<nK2#izawNkWSolq(DDTd%N=lpK7M{q9^&ZK=&zbUqNX8f;S6%c!u`~ynCMS
z6?pa{PYFCY#>WKiyvC;lMsM<If$m$}zLM~luX(e;<Tt!WVDNh!xM$ZN67~O;rv!E3
z0Us0C_lQpkbUwkBzZ93dT5f-VsQo#-S)i|w_Yi6y*cmrjnN6N&q=Kh}C@tn=LcG76
X@tGwg_R+Sy*1)Ib5zREh%WVGwK=&`T

delta 1542
zcmaKrZA@EL7{|{k1qC`vp_Ed}?Z)cF$qenFEmFFbwrsU;(0d`1Xd7dUiQ>x)UtAmv
z<A*sLgL{@dycTAaEgSJ=5M!3u5aS19^n=L~v&1x6;s-y>xcM?MnbhadlH3o*+uZv*
z{r}I)^PF>@*|#b;?rUd)6%%d_&lr4K##rvtx0@@D1k$qNSHb~y$iW_EEbSkX)A2+)
zHW*+I`jv&y2_>Bj$%&C<Ae0{UM@K@;(d%MP1}AM+zuUnMt9u3#aV43E?sn|za<Xo<
zFFzRz1$SMill836XgjNTX8ntrgB)zS7kEFM)4jyQxh);%@50}E6g~s-I)$Hy9DOgq
zR-FQ|x@s8FNBJzguUGgy{H0eQs;_~O`Uua$#d?LWz`c3}BK6fE8=|m6yljZ_Rru4O
zz!QcVkQ*YfOuXC>;cM_mgTg<8aH9g*hH6-CjPh&nd!xcP;J8tNrN$aqHAeX7@S9QL
z*Wp-`42#BU$TdZH9)4|-t2ddQ6^kzBhLd&+JZJiWPeXt6x%HdPts2_zB`w@*X}7yr
zIGBjg&T`H;t7M~cdNh=j!-;r093M;wgTYaYMBisEi`;&`6}cT|TaWV^xYcSh*V6cb
zbbKT><PRQZjvhCo0i5YTZ#7NrQJFnt_Lj^#mF!{;S64~at7JFHblPI7dX?-U*;$ee
zD!G?rI&smvK_%<DNT-t)dLw*dHJOdO?m#r*WDa-PY=VN-^t4H3c9ZEUjciuQl!UvS
zp;;wU5^hhacZ*7<B;4hcEil|>GPmxSw00mO({1*YGql1~o9U@Gl}S74DJLYUWQxjD
z4%w!XDJoA-Y5Bc7ay*fY`J+@4<vH5nZd+6Lz8x=`kmXR4yz+?s|65WpEFH3yicr+t
ze^e6Nskt_)IeNlDb^X$|Yw1ccwtm$%{5l_ke`X)5&A;>VR0li22H7KUdhQi|3VxY;
zPg5+ynRz>Rz=!ku#GkL{#{}#PqsAgVZ_-VEQ7phx^adFg`nk`*sa-5q()&EqKFF9E
zPA|pQ>#_%z_#*c9@nbxP(|!D5&4d=NXr;<bEn^w{u8;5MUcB4KZB^46#%`F<<mFP;
z5*5W8E%>;Xw`;r-rbyF#)sB;bx^B!0{xpVp!SOT}1UFvAZNUp;DD@M)h`xSqsT!il
zGKeXm-A9}h+9?XRa~89rEwZ>hC$bpOoS6q{*@`|NH)%FY?bk&6>;mbJRc%%<wzhzI
zA5E26#)9B@4z~rPmry!F?7WITLEXog61;s4Ck4O#46}l3*D)`c$zwrq{7c*x-1`km
zM~OGSN1x!?o0t;x-oi=2J3nJq@Pj*;7d)|r1wkFdZNbe4Q1TNe^ym}pXvUP_j}lG_
Y&K$t3pt%$Cf-4Rz2zIz}+s`fk0@X8|DgXcg

diff --git a/MineSweeper/MineSweeper.cpp b/MineSweeper/MineSweeper.cpp
index c8a109a..77d9ec0 100644
--- a/MineSweeper/MineSweeper.cpp
+++ b/MineSweeper/MineSweeper.cpp
@@ -17,6 +17,7 @@ ATOM                MyRegisterClass(HINSTANCE hInstance);
 BOOL                InitInstance(HINSTANCE, int);
 LRESULT CALLBACK    WndProc(HWND, UINT, WPARAM, LPARAM);
 INT_PTR CALLBACK    About(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK    Setting(HWND, UINT, WPARAM, LPARAM);
 
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 					 _In_opt_ HINSTANCE hPrevInstance,
@@ -65,7 +66,7 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 	wcex.hInstance      = hInstance;
 	wcex.hIcon          = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MINESWEEPER));
 	wcex.hCursor        = LoadCursor(nullptr, IDC_ARROW);
-	wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+1);
+	wcex.hbrBackground  = (HBRUSH)(COLOR_WINDOW+6);
 	wcex.lpszMenuName   = MAKEINTRESOURCEW(IDC_MINESWEEPER);
 	wcex.lpszClassName  = szWindowClass;
 	wcex.hIconSm        = LoadIcon(wcex.hInstance, MAKEINTRESOURCE(IDI_SMALL));
@@ -76,9 +77,10 @@ ATOM MyRegisterClass(HINSTANCE hInstance)
 BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 {
    hInst = hInstance;
+   HMENU hmenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDC_MINESWEEPER));
 
    HWND hWnd = CreateWindowW(szWindowClass, szTitle, WS_OVERLAPPEDWINDOW ^ WS_THICKFRAME,
-	  240, 100, 240, 500, nullptr, nullptr, hInstance, nullptr);
+	  240, 100, 240, 500, nullptr, hmenu, hInstance, nullptr);
 
    if (!hWnd)
    {
@@ -93,6 +95,7 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
+	HMENU hmenu = GetMenu(hWnd);
 	switch (message)
 	{
 	case WM_CREATE:
@@ -110,6 +113,39 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 			case IDM_EXIT:
 				DestroyWindow(hWnd);
 				break;
+			case IDM_NEWGAME:
+				GameRestart();
+				InvalidateRect(hWnd, NULL, TRUE);
+				break;
+			case IDM_BEGINNER:
+				SetGame(10, 10, 10);
+				GameRestart();
+				//if (CheckMenuItem(hmenu, IDM_BEGINNER, MF_CHECKED | MF_BYPOSITION))
+					//MessageBox(hWnd, _T("123"), _T("123"), MB_OK);
+				//SetMenuItemInfoA(GetMenu(hWnd), IDM_BEGINNER, TRUE, MF_CHECKED);
+				InvalidateRect(hWnd, NULL, TRUE);
+				DrawMenuBar(hWnd);
+				break;
+			case IDM_MEDIATE:
+				SetGame(16, 16, 40);
+				GameRestart();
+				InvalidateRect(hWnd, NULL, TRUE);
+				EnableMenuItem(hmenu, IDM_MEDIATE, MF_DISABLED | MF_BYPOSITION);
+				DrawMenuBar(hWnd);
+				break;
+			case IDM_EXPERT:
+				SetGame(16, 30, 99);
+				GameRestart();
+				InvalidateRect(hWnd, NULL, TRUE);
+				DrawMenuBar(hWnd);
+				break;
+			case IDM_CUSTOM:
+				DialogBox(hInst, MAKEINTRESOURCE(IDD_DIALOG1), hWnd, Setting);
+				GameRestart();
+				InvalidateRect(hWnd, NULL, TRUE);
+				EnableMenuItem(hmenu, IDM_MEDIATE, MF_DISABLED | MF_BYPOSITION);
+				DrawMenuBar(hWnd);
+				break;
 			default:
 				return DefWindowProc(hWnd, message, wParam, lParam);
 			}
@@ -134,7 +170,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 	case WM_RBUTTONDOWN:
 		{
-			int x, y;
+			int x = 0, y = 0;
 			if (wParam && MK_LBUTTON)
 			{
 				y = LOWORD(lParam);
@@ -148,10 +184,8 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 		break;
 	case WM_PAINT:
 		{
-			
 			ReSizeGameWnd(hWnd);
 			MapPainting(hWnd);
-			
 		}
 		break;
 	case WM_DESTROY:
@@ -178,9 +212,78 @@ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 			return (INT_PTR)TRUE;
 		}
 		if (LOWORD(wParam) == IDC_BUTTON1) {
-			system("start www.github.com");
+			system("start https://github.com/TcMcKrLiTb/MineSweeper");
 		}
 		break;
 	}
 	return (INT_PTR)FALSE;
 }
+
+INT_PTR CALLBACK Setting(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+
+	UNREFERENCED_PARAMETER(lParam);
+	switch (message)
+	{
+	case WM_INITDIALOG:
+		wchar_t* stri;
+		stri = (wchar_t*)malloc(sizeof(wchar_t) * 10);
+		InttoStr(GetGame(1), stri);
+
+		if (stri != NULL)
+			memset(stri, 0, sizeof(stri));
+		InttoStr(GetGame(1), stri);
+		if (stri != NULL)
+			SetDlgItemTextW(hDlg, IDC_EDIT1, stri);
+
+		if (stri != NULL)
+			memset(stri, 0, sizeof(stri));
+		InttoStr(GetGame(2), stri);
+		if (stri != NULL)
+			SetDlgItemTextW(hDlg, IDC_EDIT2, stri);
+
+		if (stri != NULL)
+			memset(stri, 0, sizeof(stri));
+		InttoStr(GetGame(3), stri);
+		if (stri != NULL)
+			SetDlgItemTextW(hDlg, IDC_EDIT3, stri);
+
+		free(stri);
+		return (INT_PTR)TRUE;
+
+	case WM_COMMAND:
+		if (LOWORD(wParam) == IDCANCEL)
+		{
+			EndDialog(hDlg, LOWORD(wParam));
+			return (INT_PTR)TRUE;
+		}
+		if (LOWORD(wParam) == IDOK) {
+
+			wchar_t* stri;
+			int x = 0;
+			stri = (wchar_t*)malloc(sizeof(wchar_t) * 10);
+			if (stri != NULL)
+				GetDlgItemTextW(hDlg, IDC_EDIT1, stri, 10);
+			StrtoInt(&x, stri);
+			JudgeNum(&x, 1);
+			SetGame(x, GetGame(2), GetGame(3));
+
+			if (stri != NULL)
+				GetDlgItemTextW(hDlg, IDC_EDIT2, stri, 10);
+			StrtoInt(&x, stri);
+			JudgeNum(&x, 2);
+			SetGame(GetGame(1), x, GetGame(3));
+
+			if (stri != NULL)
+				GetDlgItemTextW(hDlg, IDC_EDIT3, stri, 10);
+			StrtoInt(&x, stri);
+			JudgeNum(&x, 3);
+			SetGame(GetGame(1), GetGame(2), x);
+
+			EndDialog(hDlg, LOWORD(wParam));
+			return (INT_PTR)TRUE;
+		}
+		break;
+	}
+	return (INT_PTR)FALSE;
+}
\ No newline at end of file
diff --git a/MineSweeper/MineSweeper.rc b/MineSweeper/MineSweeper.rc
index 44491b35dd4f3aa1779bd1c963f328771a3a5f93..57bae106bdb635bfb9f6c3684580751d731e978f 100644
GIT binary patch
delta 1155
zcmd5*O=}ZT6uq`FCX-Gk=_C|mi?O0Hkhb}l(PZJGCSwdqCYnUr&`O{XLBtOP!G$Oa
zLiZP4xRAQiWgy^Ba2a&t!i{@Z?!=Xz`z8UYh`14X%wz6-XU;kIzB_NX$G3)$gTdlW
zW9Jl|q$;<xvOXM4<2I%F<=hfy1M@uA0=i2MZBUigsYwoB(^An6G8YlI@pP$0ZDiBF
z;h?_5*||mj5=?L;;Ny3i-#7<om1^W-ITPTD`|81dpbl=T04R*2lJ=SIo2~t@kVBi0
z1`~A!<p2EW`Bu&4J#Cfu4h6(-s7#lsqkJ`g?{+i}emv;U(<)_&Bhln&Y+Rj**I=PS
z{fUtVN~=<izv;(yn@&@Pl9U79=2ZAnr~s58T2$xj;buW64Zb#&bPp#E&>M*QD%)3i
zDXvCkWGY~G_<eZch*v?XXKXK%aGVFD3tW<l95+tPT9oCIvBLKvR@@>BE{bZm;Uoh;
z7N3o-)jxE0Z!9C03d(4rt5h1ul(2sJMkytsA<Jug7n<U~%LfAHLtzo;awT1;WKe$r
zdw!xVnH-`FFjC_>nl7Vo0Z|#Z(?SOt;J&Z;1>pkGB$<aczWPIF7XQ+q81W1iRJpdY
z{2v*V-gyS?f73zk8EgK=?(IS1JLWqPFVGoS$g45VlZ|(bvH~r%e*zV8V5#PLH$4S?
zeKrM|(++!lGLX5^(fPYGe8-IG-Y-1;bDo+{Fux^Uid~s4VV*x}$3`z=uMhtK1!>N&

delta 52
zcmV-40L%Z*Z^m4(f(Z$}i*A1?044xNlOGL3vz`pv1qLwyE&wn9li(8|vz`)W0<)YN
KU;?uo9<mwc=@B&m

diff --git a/MineSweeper/Themap.cpp b/MineSweeper/Themap.cpp
index 7609e28..57aa152 100644
--- a/MineSweeper/Themap.cpp
+++ b/MineSweeper/Themap.cpp
@@ -19,7 +19,7 @@ bool _blocks::JudgeisWin()
 			}
 		}
 	}
-	if ((cnt1 + cnt2) == (size_col * size_row))
+	if ((cnt1 + cnt2) == (size_col * size_row) || (size_row * size_col - cnt1) == tot_bomb)
 	{
 		return true;
 	}
@@ -46,14 +46,39 @@ void _blocks::InitBox(int x, int y)
 void _blocks::RandomSetMines(int x, int y, int tot)
 {
 	srand((unsigned)time(NULL));
-	for (int i = 1; i <= tot; )
+	int _size = size_row * size_col;
+	if (tot <= (_size * 6) / 10)
 	{
-		int a = rand() % size_row + 1;
-		int b = rand() % size_col + 1;
-		if (_Block[a][b] == 0 && a != x && b != y) 
+		for (int i = 1; i <= tot; )
 		{
-			_Block[a][b] = -1;
-			i++;
+			int a = rand() % size_row + 1;
+			int b = rand() % size_col + 1;
+			if (_Block[a][b] == 0 && a != x && b != y)
+			{
+				_Block[a][b] = -1;
+				i++;
+			}
+		}
+	}
+	else
+	{
+		for (int i = 1; i <= size_row; i++)
+		{
+			for (int j = 1; j <= size_col; j++)
+			{
+				if (i != x || j != y)
+					_Block[i][j] = -1;
+			}
+		}
+		for (int i = 1; i <= _size - tot - 1; )
+		{
+			int a = rand() % size_row + 1;
+			int b = rand() % size_col + 1;
+			if (_Block[a][b] == -1)
+			{
+				_Block[a][b] = 0;
+				i++;
+			}
 		}
 	}
 	tot_bomb = tot;
@@ -128,6 +153,16 @@ int _blocks::ComputNums(int x, int y)
 	return ans;
 }
 
+int _blocks::ComputFlag(int x, int y)
+{
+	int ans = 0;
+	for (int i = 0; i < 8; i++)
+	{
+		ans += (_flag[x + step[i][0]][y + step[i][1]] == true);
+	}
+	return ans;
+}
+
 int _blocks::Flagnum()
 {
 	int ans = 0;
diff --git a/MineSweeper/Themap.h b/MineSweeper/Themap.h
index bf17785..8bb20c8 100644
--- a/MineSweeper/Themap.h
+++ b/MineSweeper/Themap.h
@@ -18,6 +18,7 @@ typedef struct _blocks
 	void SearchAD(int x, int y);
 	int GetBloID(int x, int y);
 	int ComputNums(int x, int y);
+	int ComputFlag(int x, int y);
 	int Flagnum();
 	int Bombnum();
 	bool JudgeisWin();
diff --git a/MineSweeper/resource.h b/MineSweeper/resource.h
index 9d38f6f..68498e6 100644
--- a/MineSweeper/resource.h
+++ b/MineSweeper/resource.h
@@ -38,8 +38,18 @@
 #define IDB_NORMAL                      193
 #define IDB_WINNER                      194
 #define IDB_LOSSER                      195
+#define IDD_DIALOG1                     196
 #define IDC_BUTTON1                     1000
 #define IDC_TAB1                        1001
+#define IDC_EDIT1                       1006
+#define IDC_EDIT2                       1007
+#define IDC_EDIT3                       1008
+#define IDM_NEWGAME                     32778
+#define IDM_BEGINNER                    32780
+#define IDM_MEDIATE                     32782
+#define IDM_EXPERT                      32783
+#define ID_32784                        32784
+#define IDM_CUSTOM                      32785
 #define IDC_STATIC                      -1
 
 // Next default values for new objects
@@ -47,9 +57,9 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
-#define _APS_NEXT_RESOURCE_VALUE        196
-#define _APS_NEXT_COMMAND_VALUE         32771
-#define _APS_NEXT_CONTROL_VALUE         1002
+#define _APS_NEXT_RESOURCE_VALUE        197
+#define _APS_NEXT_COMMAND_VALUE         32786
+#define _APS_NEXT_CONTROL_VALUE         1006
 #define _APS_NEXT_SYMED_VALUE           122
 #endif
 #endif
diff --git a/README.md b/README.md
index eb4d762..7404249 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,19 @@
 # MineSweeper
+
+A MineSweeper based on win32api. 
+
+The first click won't be **The Mine**.
+
+The number in one opened block means **how many** mines around it.
+
+Your goal is finding **all of** the mines.
+
+If you click on a **Mine block**, the game will over and you will lose.
+
+Click the **yellow face** to restart
+
+Do not forget to give me star~
+
+基于win32api的扫雷
+
+第一次点击不会是雷。格子里的数字表示它周围有几个雷。游戏目标是找出所有雷。“触雷”则输。点击表情重新开始。