Browse Source

🚚 engine.h: Extract `Rectangle`

pull/2207/head
Gleb Mazovetskiy 5 years ago committed by Anders Jenbo
parent
commit
1bc9c3973f
  1. 3
      Source/control.h
  2. 5
      Source/engine.h
  3. 13
      Source/engine/rectangle.hpp
  4. 7
      Source/miniwin/misc_msg.cpp

3
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 {

5
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);

13
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

7
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"

Loading…
Cancel
Save