From 1bc9c3973f02f3a7d402dfd587b53b2590e656d2 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Mon, 21 Jun 2021 09:37:43 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20engine.h:=20Extract=20`Rectangle?=
 =?UTF-8?q?`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Source/control.h            |  3 ++-
 Source/engine.h             |  5 -----
 Source/engine/rectangle.hpp | 13 +++++++++++++
 Source/miniwin/misc_msg.cpp |  7 ++++---
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 Source/engine/rectangle.hpp

diff --git a/Source/control.h b/Source/control.h
index 4e75b7145..a002b5879 100644
--- a/Source/control.h
+++ b/Source/control.h
@@ -9,11 +9,12 @@
 
 #include "engine.h"
 #include "engine/point.hpp"
+#include "engine/rectangle.hpp"
 #include "engine/render/text_render.hpp"
 #include "spelldat.h"
 #include "spells.h"
-#include "utils/ui_fwd.h"
 #include "utils/stdcompat/optional.hpp"
+#include "utils/ui_fwd.h"
 
 namespace devilution {
 
diff --git a/Source/engine.h b/Source/engine.h
index 1d8d5bc5f..ad59b3dc4 100644
--- a/Source/engine.h
+++ b/Source/engine.h
@@ -44,11 +44,6 @@
 
 namespace devilution {
 
-struct Rectangle {
-	Point position;
-	Size size;
-};
-
 inline byte *CelGetFrameStart(byte *pCelBuff, int nCel)
 {
 	const uint32_t *pFrameTable = reinterpret_cast<const std::uint32_t *>(pCelBuff);
diff --git a/Source/engine/rectangle.hpp b/Source/engine/rectangle.hpp
new file mode 100644
index 000000000..0a6363097
--- /dev/null
+++ b/Source/engine/rectangle.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "engine/point.hpp"
+#include "engine/size.hpp"
+
+namespace devilution {
+
+struct Rectangle {
+	Point position;
+	Size size;
+};
+
+} // namespace devilution
diff --git a/Source/miniwin/misc_msg.cpp b/Source/miniwin/misc_msg.cpp
index a2dc165b8..145e6059d 100644
--- a/Source/miniwin/misc_msg.cpp
+++ b/Source/miniwin/misc_msg.cpp
@@ -3,21 +3,22 @@
 #include <deque>
 
 #include "control.h"
-#include "controls/controller.h"
 #include "controls/controller_motion.h"
+#include "controls/controller.h"
 #include "controls/game_controls.h"
 #include "controls/plrctrls.h"
 #include "controls/remap_keyboard.h"
 #include "controls/touch.h"
 #include "cursor.h"
+#include "engine/rectangle.hpp"
 #include "hwcursor.hpp"
 #include "inv.h"
+#include "miniwin/miniwin.h"
 #include "movie.h"
 #include "utils/display.h"
+#include "utils/log.hpp"
 #include "utils/sdl_compat.h"
 #include "utils/stubs.h"
-#include "utils/log.hpp"
-#include "miniwin/miniwin.h"
 
 #ifdef __SWITCH__
 #include "platform/switch/docking.h"