From a37311ddc472c02c0584ad2b0d18ea8d90b88029 Mon Sep 17 00:00:00 2001
From: Juliano Leal Goncalves <julealgon@gmail.com>
Date: Sat, 5 Jun 2021 22:41:18 -0300
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Leverage=20'Point.Contains?=
 =?UTF-8?q?'=20for=20bound=20checks=20related=20to=20character=20buttons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source/control.cpp           | 12 ++----------
 Source/controls/plrctrls.cpp | 10 ++--------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/Source/control.cpp b/Source/control.cpp
index bd284d39c..00205298f 100644
--- a/Source/control.cpp
+++ b/Source/control.cpp
@@ -1438,12 +1438,7 @@ void CheckChrBtns()
 			continue;
 		}
 		auto buttonId = static_cast<size_t>(attribute);
-		int x = ChrBtnsRect[buttonId].position.x + ChrBtnsRect[buttonId].size.width;
-		int y = ChrBtnsRect[buttonId].position.y + ChrBtnsRect[buttonId].size.height;
-		if (MousePosition.x >= ChrBtnsRect[buttonId].position.x
-		    && MousePosition.x <= x
-		    && MousePosition.y >= ChrBtnsRect[buttonId].position.y
-		    && MousePosition.y <= y) {
+		if (ChrBtnsRect[buttonId].Contains(MousePosition)) {
 			chrbtn[buttonId] = true;
 			chrbtnactive = true;
 		}
@@ -1466,10 +1461,7 @@ void ReleaseChrBtns(bool addAllStatPoints)
 			continue;
 
 		chrbtn[buttonId] = false;
-		if (MousePosition.x >= ChrBtnsRect[buttonId].position.x
-		    && MousePosition.x <= ChrBtnsRect[buttonId].position.x + ChrBtnsRect[buttonId].size.width
-		    && MousePosition.y >= ChrBtnsRect[buttonId].position.y
-		    && MousePosition.y <= ChrBtnsRect[buttonId].position.y + ChrBtnsRect[buttonId].size.height) {
+		if (ChrBtnsRect[buttonId].Contains(MousePosition)) {
 			auto &myPlayer = plr[myplr];
 			int statPointsToAdd = 1;
 			if (addAllStatPoints)
diff --git a/Source/controls/plrctrls.cpp b/Source/controls/plrctrls.cpp
index d17a6ebf6..e95264afd 100644
--- a/Source/controls/plrctrls.cpp
+++ b/Source/controls/plrctrls.cpp
@@ -465,10 +465,7 @@ void AttrIncBtnSnap(AxisDirection dir)
 	// first, find our cursor location
 	int slot = 0;
 	for (int i = 0; i < 4; i++) {
-		if (MousePosition.x >= ChrBtnsRect[i].position.x
-		    && MousePosition.x <= ChrBtnsRect[i].position.x + ChrBtnsRect[i].size.width
-		    && MousePosition.y >= ChrBtnsRect[i].position.y
-		    && MousePosition.y <= ChrBtnsRect[i].size.height + ChrBtnsRect[i].position.y) {
+		if (ChrBtnsRect[i].Contains(MousePosition)) {
 			slot = i;
 			break;
 		}
@@ -1382,10 +1379,7 @@ void PerformPrimaryAction()
 	if (chrflag && !chrbtnactive && plr[myplr]._pStatPts > 0) {
 		CheckChrBtns();
 		for (int i = 0; i < 4; i++) {
-			if (MousePosition.x >= ChrBtnsRect[i].position.x
-			    && MousePosition.x <= ChrBtnsRect[i].position.x + ChrBtnsRect[i].size.width
-			    && MousePosition.y >= ChrBtnsRect[i].position.y
-			    && MousePosition.y <= ChrBtnsRect[i].size.height + ChrBtnsRect[i].position.y) {
+			if (ChrBtnsRect[i].Contains(MousePosition)) {
 				chrbtn[i] = true;
 				chrbtnactive = true;
 				ReleaseChrBtns(false);