From 0501ff10ef1de121c22c5756b678304ca59ed154 Mon Sep 17 00:00:00 2001
From: Robin Eklind <rnd0x00@gmail.com>
Date: Wed, 17 Apr 2019 11:36:30 +0900
Subject: [PATCH] Use RECT32 struct for attribute_inc_rects

---
 Source/control.cpp | 18 +++++++++---------
 Source/control.h   |  2 +-
 structs.h          | 12 ++++++++++++
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Source/control.cpp b/Source/control.cpp
index 83e8a806d..88d655efe 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -159,7 +159,7 @@ char *PanBtnStr[8] = {
 	"Send Message",
 	"Player Attack"
 };
-int attribute_inc_rects[4][4] = {
+RECT32 attribute_inc_rects[4] = {
 	{ 137, 138, 41, 22 },
 	{ 137, 166, 41, 22 },
 	{ 137, 195, 41, 22 },
@@ -2238,10 +2238,10 @@ void CheckChrBtns()
 			default:
 				continue;
 			}
-			if (MouseX >= attribute_inc_rects[i][0]
-			    && MouseX <= attribute_inc_rects[i][0] + attribute_inc_rects[i][2]
-			    && MouseY >= attribute_inc_rects[i][1]
-			    && MouseY <= attribute_inc_rects[i][3] + attribute_inc_rects[i][1]) {
+			if (MouseX >= attribute_inc_rects[i].x
+			    && MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w
+			    && MouseY >= attribute_inc_rects[i].y
+			    && MouseY <= attribute_inc_rects[i].y + attribute_inc_rects[i].h) {
 				chrbtn[i] = TRUE;
 				chrbtnactive = TRUE;
 			}
@@ -2257,10 +2257,10 @@ void ReleaseChrBtns()
 	for (i = 0; i < 4; ++i) {
 		if (chrbtn[i]) {
 			chrbtn[i] = FALSE;
-			if (MouseX >= attribute_inc_rects[i][0]
-			    && MouseX <= attribute_inc_rects[i][0] + attribute_inc_rects[i][2]
-			    && MouseY >= attribute_inc_rects[i][1]
-			    && MouseY <= attribute_inc_rects[i][3] + attribute_inc_rects[i][1]) {
+			if (MouseX >= attribute_inc_rects[i].x
+			    && MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w
+			    && MouseY >= attribute_inc_rects[i].y
+			    && MouseY <= attribute_inc_rects[i].y + attribute_inc_rects[i].h) {
 				switch (i) {
 				case 0:
 					NetSendCmdParam1(TRUE, CMD_ADDSTR, 1);
diff --git a/Source/control.h b/Source/control.h
index 2cb9fe7f5..c4561824e 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -131,7 +131,7 @@ extern unsigned char SpellITbl[MAX_SPELLS];
 extern int PanBtnPos[8][5];
 extern char *PanBtnHotKey[8];
 extern char *PanBtnStr[8];
-extern int attribute_inc_rects[4][4];
+extern RECT32 attribute_inc_rects[4];
 extern int SpellPages[6][7];
 
 #endif /* __CONTROL_H__ */
diff --git a/structs.h b/structs.h
index ff044c687..54bb38251 100644
--- a/structs.h
+++ b/structs.h
@@ -1,3 +1,15 @@
+//////////////////////////////////////////////////
+// control
+//////////////////////////////////////////////////
+
+// size: 0x10
+typedef struct RECT32 {
+	int x;
+	int y;
+	int w;
+	int h;
+} RECT32;
+
 //////////////////////////////////////////////////
 // items
 //////////////////////////////////////////////////