From 59dd42692f34833cf759d21b78103cb4d08435e7 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Thu, 6 May 2021 19:52:11 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=9A=20Move=20render.cpp=20to=20engine/?= =?UTF-8?q?render/dun=5Frender.cpp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 2 +- Source/DiabloUI/art_draw.cpp | 1 - Source/capture.cpp | 1 - Source/cursor.cpp | 2 +- Source/dx.cpp | 2 +- Source/engine.h | 8 ++++++++ Source/{render.cpp => engine/render/dun_render.cpp} | 4 ++-- Source/{render.h => engine/render/dun_render.hpp} | 10 +--------- Source/palette.cpp | 1 - Source/scrollrt.cpp | 9 +++++---- 10 files changed, 19 insertions(+), 21 deletions(-) rename Source/{render.cpp => engine/render/dun_render.cpp} (96%) rename Source/{render.h => engine/render/dun_render.hpp} (72%) diff --git a/CMakeLists.txt b/CMakeLists.txt index f86a96200..e9d1eac80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -322,7 +322,6 @@ set(devilutionx_SRCS Source/plrmsg.cpp Source/portal.cpp Source/quests.cpp - Source/render.cpp Source/restrict.cpp Source/scrollrt.cpp Source/setmaps.cpp @@ -352,6 +351,7 @@ set(devilutionx_SRCS Source/controls/keymapper.cpp Source/engine/animationinfo.cpp Source/engine/render/automap_render.cpp + Source/engine/render/dun_render.cpp Source/qol/autopickup.cpp Source/qol/common.cpp Source/qol/monhealthbar.cpp diff --git a/Source/DiabloUI/art_draw.cpp b/Source/DiabloUI/art_draw.cpp index 9ab756a87..2a8638b58 100644 --- a/Source/DiabloUI/art_draw.cpp +++ b/Source/DiabloUI/art_draw.cpp @@ -1,7 +1,6 @@ #include "DiabloUI/art_draw.h" #include "DiabloUI/diabloui.h" -#include "render.h" #include "utils/display.h" #include "utils/sdl_compat.h" diff --git a/Source/capture.cpp b/Source/capture.cpp index ecee9a8dd..c9f980323 100644 --- a/Source/capture.cpp +++ b/Source/capture.cpp @@ -8,7 +8,6 @@ #include "DiabloUI/diabloui.h" #include "dx.h" #include "palette.h" -#include "render.h" #include "storm/storm.h" #include "utils/file_util.h" #include "utils/paths.h" diff --git a/Source/cursor.cpp b/Source/cursor.cpp index 8b9de1f98..595065804 100644 --- a/Source/cursor.cpp +++ b/Source/cursor.cpp @@ -7,9 +7,9 @@ #include "control.h" #include "doom.h" +#include "engine.h" #include "inv.h" #include "missiles.h" -#include "render.h" #include "towners.h" #include "track.h" #include "trigs.h" diff --git a/Source/dx.cpp b/Source/dx.cpp index 5234b8472..195f0b96f 100644 --- a/Source/dx.cpp +++ b/Source/dx.cpp @@ -7,8 +7,8 @@ #include +#include "engine.h" #include "options.h" -#include "render.h" #include "storm/storm.h" #include "utils/display.h" #include "utils/log.hpp" diff --git a/Source/engine.h b/Source/engine.h index a08a945f8..b752653f3 100644 --- a/Source/engine.h +++ b/Source/engine.h @@ -30,6 +30,14 @@ #include "appfat.h" #include "miniwin/miniwin.h" +#define BUFFER_BORDER_LEFT 64 +#define BUFFER_BORDER_TOP 160 +#define BUFFER_BORDER_RIGHT devilution::borderRight +#define BUFFER_BORDER_BOTTOM 16 + +#define TILE_WIDTH 64 +#define TILE_HEIGHT 32 + namespace devilution { #if __cplusplus >= 201703L diff --git a/Source/render.cpp b/Source/engine/render/dun_render.cpp similarity index 96% rename from Source/render.cpp rename to Source/engine/render/dun_render.cpp index 8edcc1948..4e9a1a045 100644 --- a/Source/render.cpp +++ b/Source/engine/render/dun_render.cpp @@ -1,9 +1,9 @@ /** - * @file render.cpp + * @file dun_render.cpp * * Implementation of functionality for rendering the level tiles. */ -#include "render.h" +#include "engine/render/dun_render.hpp" #include #include diff --git a/Source/render.h b/Source/engine/render/dun_render.hpp similarity index 72% rename from Source/render.h rename to Source/engine/render/dun_render.hpp index 210acb4dc..8469e894b 100644 --- a/Source/render.h +++ b/Source/engine/render/dun_render.hpp @@ -1,5 +1,5 @@ /** - * @file render.h + * @file dun_render.hpp * * Interface of functionality for rendering the level tiles. */ @@ -9,14 +9,6 @@ namespace devilution { -#define BUFFER_BORDER_LEFT 64 -#define BUFFER_BORDER_TOP 160 -#define BUFFER_BORDER_RIGHT devilution::borderRight -#define BUFFER_BORDER_BOTTOM 16 - -#define TILE_WIDTH 64 -#define TILE_HEIGHT 32 - /** * @brief Blit current world CEL to the given buffer * @param out Target buffer diff --git a/Source/palette.cpp b/Source/palette.cpp index 9af2ade8b..9f5d33657 100644 --- a/Source/palette.cpp +++ b/Source/palette.cpp @@ -6,7 +6,6 @@ #include "dx.h" #include "options.h" -#include "render.h" #include "storm/storm.h" #include "utils/display.h" #include "utils/sdl_compat.h" diff --git a/Source/scrollrt.cpp b/Source/scrollrt.cpp index 407c4c168..36aa7479b 100644 --- a/Source/scrollrt.cpp +++ b/Source/scrollrt.cpp @@ -8,11 +8,9 @@ #include "control.h" #include "cursor.h" #include "dead.h" -#ifdef _DEBUG -#include "debug.h" -#endif #include "doom.h" #include "dx.h" +#include "engine/render/dun_render.hpp" #include "error.h" #include "gmenu.h" #include "help.h" @@ -25,11 +23,14 @@ #include "plrmsg.h" #include "qol/monhealthbar.h" #include "qol/xpbar.h" -#include "render.h" #include "stores.h" #include "towners.h" #include "utils/log.hpp" +#ifdef _DEBUG +#include "debug.h" +#endif + namespace devilution { /**