🚚 Move render.cpp to engine/render/dun_render.cpp

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

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"
 

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"

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"

Source/dx.cpp

@@ -7,8 +7,8 @@
 
 #include <SDL.h>
 
+#include "engine.h"
 #include "options.h"
-#include "render.h"
 #include "storm/storm.h"
 #include "utils/display.h"
 #include "utils/log.hpp"

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

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 <algorithm>
 #include <climits>

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

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"

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 {
 
 /**