♻️ Leverage 'Size' to represent a 'Rectangle's width/height

Source/control.cpp

@@ -1440,8 +1440,8 @@ void CheckChrBtns()
 			continue;
 		}
 		auto buttonId = static_cast<size_t>(attribute);
-		int x = ChrBtnsRect[buttonId].position.x + ChrBtnsRect[buttonId].w;
-		int y = ChrBtnsRect[buttonId].position.y + ChrBtnsRect[buttonId].h;
+		int x = ChrBtnsRect[buttonId].position.x + ChrBtnsRect[buttonId].size.width;
+		int y = ChrBtnsRect[buttonId].position.y + ChrBtnsRect[buttonId].size.height;
 		if (MouseX >= ChrBtnsRect[buttonId].position.x
 		    && MouseX <= x
 		    && MouseY >= ChrBtnsRect[buttonId].position.y
@@ -1469,9 +1469,9 @@ void ReleaseChrBtns(bool addAllStatPoints)
 
 		chrbtn[buttonId] = false;
 		if (MouseX >= ChrBtnsRect[buttonId].position.x
-		    && MouseX <= ChrBtnsRect[buttonId].position.x + ChrBtnsRect[buttonId].w
+		    && MouseX <= ChrBtnsRect[buttonId].position.x + ChrBtnsRect[buttonId].size.width
 		    && MouseY >= ChrBtnsRect[buttonId].position.y
-		    && MouseY <= ChrBtnsRect[buttonId].position.y + ChrBtnsRect[buttonId].h) {
+		    && MouseY <= ChrBtnsRect[buttonId].position.y + ChrBtnsRect[buttonId].size.height) {
 			auto &myPlayer = plr[myplr];
 			int statPointsToAdd = 1;
 			if (addAllStatPoints)

Source/controls/plrctrls.cpp

@@ -471,9 +471,9 @@ void AttrIncBtnSnap(AxisDirection dir)
 	int slot = 0;
 	for (int i = 0; i < 4; i++) {
 		if (MouseX >= ChrBtnsRect[i].position.x
-		    && MouseX <= ChrBtnsRect[i].position.x + ChrBtnsRect[i].w
+		    && MouseX <= ChrBtnsRect[i].position.x + ChrBtnsRect[i].size.width
 		    && MouseY >= ChrBtnsRect[i].position.y
-		    && MouseY <= ChrBtnsRect[i].h + ChrBtnsRect[i].position.y) {
+		    && MouseY <= ChrBtnsRect[i].size.height + ChrBtnsRect[i].position.y) {
 			slot = i;
 			break;
 		}
@@ -488,8 +488,8 @@ void AttrIncBtnSnap(AxisDirection dir)
 	}
 
 	// move cursor to our new location
-	int x = ChrBtnsRect[slot].position.x + (ChrBtnsRect[slot].w / 2);
-	int y = ChrBtnsRect[slot].position.y + (ChrBtnsRect[slot].h / 2);
+	int x = ChrBtnsRect[slot].position.x + (ChrBtnsRect[slot].size.width / 2);
+	int y = ChrBtnsRect[slot].position.y + (ChrBtnsRect[slot].size.height / 2);
 	SetCursorPos(x, y);
 }
 
@@ -1401,9 +1401,9 @@ void PerformPrimaryAction()
 		CheckChrBtns();
 		for (int i = 0; i < 4; i++) {
 			if (MouseX >= ChrBtnsRect[i].position.x
-			    && MouseX <= ChrBtnsRect[i].position.x + ChrBtnsRect[i].w
+			    && MouseX <= ChrBtnsRect[i].position.x + ChrBtnsRect[i].size.width
 			    && MouseY >= ChrBtnsRect[i].position.y
-			    && MouseY <= ChrBtnsRect[i].h + ChrBtnsRect[i].position.y) {
+			    && MouseY <= ChrBtnsRect[i].size.height + ChrBtnsRect[i].position.y) {
 				chrbtn[i] = true;
 				chrbtnactive = true;
 				ReleaseChrBtns(false);

Source/engine.h

@@ -226,8 +226,7 @@ struct Size {
 
 struct Rectangle {
 	Point position;
-	int w;
-	int h;
+	Size size;
 };
 
 struct ActorPosition {

Source/miniwin/misc_msg.cpp

@@ -79,7 +79,7 @@ void FocusOnCharInfo()
 	if (stat == -1)
 		return;
 	const Rectangle &rect = ChrBtnsRect[stat];
-	SetCursorPos(rect.position.x + (rect.w / 2), rect.position.y + (rect.h / 2));
+	SetCursorPos(rect.position.x + (rect.size.width / 2), rect.position.y + (rect.size.height / 2));
 }
 
 static int TranslateSdlKey(SDL_Keysym key)