From ff147f9280dc7f6387aca87c9d4e391c2b1e6db1 Mon Sep 17 00:00:00 2001 From: Juliano Leal Goncalves Date: Sat, 5 Jun 2021 21:25:01 -0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Rename=20'RECT32'=20to=20'Rectan?= =?UTF-8?q?gle'=20to=20match=20naming=20style=20of=20other=20core=20struct?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/control.cpp | 2 +- Source/control.h | 2 +- Source/engine.h | 2 +- Source/miniwin/misc_msg.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/control.cpp b/Source/control.cpp index ca7fcd673..2f01b1350 100644 --- a/Source/control.cpp +++ b/Source/control.cpp @@ -203,7 +203,7 @@ const char *const PanBtnStr[8] = { "" // Player attack }; /** Maps from attribute_id to the rectangle on screen used for attribute increment buttons. */ -RECT32 ChrBtnsRect[4] = { +Rectangle ChrBtnsRect[4] = { { 137, 138, 41, 22 }, { 137, 166, 41, 22 }, { 137, 195, 41, 22 }, diff --git a/Source/control.h b/Source/control.h index 59ab36058..b6620e3bf 100644 --- a/Source/control.h +++ b/Source/control.h @@ -134,6 +134,6 @@ void control_reset_talk(); bool control_talk_last_key(int vkey); bool control_presskeys(int vkey); -extern RECT32 ChrBtnsRect[4]; +extern Rectangle ChrBtnsRect[4]; } // namespace devilution diff --git a/Source/engine.h b/Source/engine.h index 087528f7a..1876129a2 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -224,7 +224,7 @@ struct Size { } }; -struct RECT32 { +struct Rectangle { int x; int y; int w; diff --git a/Source/miniwin/misc_msg.cpp b/Source/miniwin/misc_msg.cpp index b76516539..9889eed4c 100644 --- a/Source/miniwin/misc_msg.cpp +++ b/Source/miniwin/misc_msg.cpp @@ -78,7 +78,7 @@ void FocusOnCharInfo() } if (stat == -1) return; - const RECT32 &rect = ChrBtnsRect[stat]; + const Rectangle &rect = ChrBtnsRect[stat]; SetCursorPos(rect.x + (rect.w / 2), rect.y + (rect.h / 2)); }