Move level generation to subfolder

Source/CMakeLists.txt

@@ -13,10 +13,6 @@ set(libdevilutionx_SRCS
   debug.cpp
   diablo.cpp
   doom.cpp
-  drlg_l1.cpp
-  drlg_l2.cpp
-  drlg_l3.cpp
-  drlg_l4.cpp
   dthread.cpp
   dx.cpp
   encrypt.cpp
@@ -24,7 +20,6 @@ set(libdevilutionx_SRCS
   error.cpp
   engine/assets.cpp
   gamemenu.cpp
-  gendung.cpp
   gmenu.cpp
   help.cpp
   hwcursor.cpp
@@ -58,19 +53,15 @@ set(libdevilutionx_SRCS
   quests.cpp
   restrict.cpp
   scrollrt.cpp
-  setmaps.cpp
   sha.cpp
   spelldat.cpp
   spells.cpp
   stores.cpp
   sync.cpp
   textdat.cpp
-  themes.cpp
   tmsg.cpp
-  town.cpp
   towners.cpp
   track.cpp
-  trigs.cpp
   controls/axis_direction.cpp
   controls/controller.cpp
   controls/controller_motion.cpp
@@ -95,6 +86,15 @@ set(libdevilutionx_SRCS
   engine/render/text_render.cpp
   engine/surface.cpp
   engine/trn.cpp
+  levels/drlg_l1.cpp
+  levels/drlg_l2.cpp
+  levels/drlg_l3.cpp
+  levels/drlg_l4.cpp
+  levels/gendung.cpp
+  levels/setmaps.cpp
+  levels/themes.cpp
+  levels/town.cpp
+  levels/trigs.cpp
   mpq/mpq_reader.cpp
   mpq/mpq_sdl_rwops.cpp
   mpq/mpq_writer.cpp

Source/DiabloUI/selgame.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/automap.cpp

@@ -10,10 +10,10 @@
 #include "control.h"
 #include "engine/load_file.hpp"
 #include "engine/render/automap_render.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "palette.h"
 #include "player.h"
-#include "setmaps.h"
 #include "utils/language.h"
 #include "utils/stdcompat/algorithm.hpp"
 #include "utils/ui_fwd.h"

Source/automap.h

@@ -10,7 +10,7 @@
 #include "engine.h"
 #include "engine/displacement.hpp"
 #include "engine/point.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "utils/attributes.h"
 
 namespace devilution {

Source/control.cpp

@@ -28,6 +28,7 @@
 #include "init.h"
 #include "inv.h"
 #include "inv_iterators.hpp"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "minitext.h"
 #include "missiles.h"
@@ -41,7 +42,6 @@
 #include "qol/xpbar.h"
 #include "stores.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 #include "utils/sdl_geometry.h"

Source/controls/plrctrls.cpp

@@ -25,6 +25,7 @@
 #include "hwcursor.hpp"
 #include "inv.h"
 #include "items.h"
+#include "levels/trigs.h"
 #include "minitext.h"
 #include "missiles.h"
 #include "panels/spell_list.hpp"
@@ -34,7 +35,6 @@
 #include "stores.h"
 #include "towners.h"
 #include "track.h"
-#include "trigs.h"
 #include "utils/log.hpp"
 
 #define SPLICONLENGTH 56

Source/controls/touch/renderers.cpp

@@ -6,9 +6,9 @@
 #include "doom.h"
 #include "engine.h"
 #include "engine/render/cel_render.hpp"
-#include "gendung.h"
 #include "init.h"
 #include "inv.h"
+#include "levels/gendung.h"
 #include "minitext.h"
 #include "panels/ui_panels.hpp"
 #include "stores.h"

Source/cursor.cpp

@@ -18,12 +18,12 @@
 #include "engine/render/cel_render.hpp"
 #include "hwcursor.hpp"
 #include "inv.h"
+#include "levels/trigs.h"
 #include "missiles.h"
 #include "qol/itemlabels.h"
 #include "qol/stash.h"
 #include "towners.h"
 #include "track.h"
-#include "trigs.h"
 #include "utils/attributes.h"
 #include "utils/language.h"
 #include "utils/utf8.hpp"

Source/dead.cpp

@@ -5,7 +5,7 @@
  */
 #include "dead.h"
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "lighting.h"
 #include "misdat.h"
 #include "monster.h"

Source/debug.cpp

@@ -20,12 +20,12 @@
 #include "engine/point.hpp"
 #include "error.h"
 #include "inv.h"
+#include "levels/setmaps.h"
 #include "lighting.h"
 #include "monstdat.h"
 #include "monster.h"
 #include "plrmsg.h"
 #include "quests.h"
-#include "setmaps.h"
 #include "spells.h"
 #include "towners.h"
 #include "utils/language.h"

Source/diablo.cpp

@@ -24,10 +24,6 @@
 #include "diablo.h"
 #include "discord/discord.h"
 #include "doom.h"
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
 #include "dx.h"
 #include "encrypt.h"
 #include "engine/cel_sprite.hpp"
@@ -37,11 +33,19 @@
 #include "engine/random.hpp"
 #include "error.h"
 #include "gamemenu.h"
-#include "gendung.h"
 #include "gmenu.h"
 #include "help.h"
 #include "hwcursor.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l2.h"
+#include "levels/drlg_l3.h"
+#include "levels/drlg_l4.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
+#include "levels/themes.h"
+#include "levels/town.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "loadsave.h"
 #include "menu.h"
@@ -63,16 +67,12 @@
 #include "qol/stash.h"
 #include "qol/xpbar.h"
 #include "restrict.h"
-#include "setmaps.h"
 #include "sound.h"
 #include "stores.h"
 #include "storm/storm_net.hpp"
 #include "storm/storm_svid.h"
-#include "themes.h"
-#include "town.h"
 #include "towners.h"
 #include "track.h"
-#include "trigs.h"
 #include "utils/console.h"
 #include "utils/display.h"
 #include "utils/language.h"

Source/diablo.h

@@ -10,8 +10,8 @@
 #ifdef _DEBUG
 #include "monstdat.h"
 #endif
-#include "gendung.h"
 #include "init.h"
+#include "levels/gendung.h"
 #include "utils/attributes.h"
 #include "utils/endian.hpp"
 

Source/discord/discord.cpp

@@ -12,12 +12,12 @@
 #include <fmt/format.h>
 
 #include "config.h"
-#include "gendung.h"
 #include "init.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "multi.h"
 #include "panels/charpanel.hpp"
 #include "player.h"
-#include "setmaps.h"
 #include "utils/language.h"
 
 namespace devilution {

Source/inv.cpp

@@ -18,13 +18,13 @@
 #include "engine/size.hpp"
 #include "hwcursor.hpp"
 #include "inv_iterators.hpp"
+#include "levels/town.h"
 #include "minitext.h"
 #include "options.h"
 #include "panels/ui_panels.hpp"
 #include "plrmsg.h"
 #include "qol/stash.h"
 #include "stores.h"
-#include "town.h"
 #include "towners.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"

Source/items.cpp

@@ -27,6 +27,7 @@
 #include "engine/render/text_render.hpp"
 #include "init.h"
 #include "inv_iterators.hpp"
+#include "levels/town.h"
 #include "lighting.h"
 #include "missiles.h"
 #include "options.h"
@@ -36,7 +37,6 @@
 #include "qol/stash.h"
 #include "spells.h"
 #include "stores.h"
-#include "town.h"
 #include "utils/format_int.hpp"
 #include "utils/language.h"
 #include "utils/math.h"

Source/levels/drlg_l1.cpp

@@ -1,14 +1,14 @@
 /**
- * @file drlg_l1.cpp
+ * @file levels/drlg_l1.cpp
  *
  * Implementation of the cathedral level generation algorithms.
  */
-#include "drlg_l1.h"
+#include "levels/drlg_l1.h"
 
 #include "engine/load_file.hpp"
 #include "engine/point.hpp"
 #include "engine/random.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "player.h"
 #include "quests.h"
 #include "utils/bitset2d.hpp"

Source/levels/drlg_l1.h

@@ -1,11 +1,11 @@
 /**
- * @file drlg_l1.h
+ * @file levels/drlg_l1.h
  *
  * Interface of the cathedral level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/levels/drlg_l2.cpp

@@ -1,9 +1,9 @@
 /**
- * @file drlg_l2.cpp
+ * @file levels/drlg_l2.cpp
  *
  * Implementation of the catacombs level generation algorithms.
  */
-#include "drlg_l2.h"
+#include "levels/drlg_l2.h"
 
 #include <list>
 
@@ -11,10 +11,10 @@
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "engine/size.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "player.h"
 #include "quests.h"
-#include "setmaps.h"
 #include "utils/stdcompat/algorithm.hpp"
 
 namespace devilution {

Source/levels/drlg_l2.h

@@ -1,11 +1,11 @@
 /**
- * @file drlg_l2.h
+ * @file levels/drlg_l2.h
  *
  * Interface of the catacombs level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/levels/drlg_l3.cpp

@@ -1,21 +1,15 @@
-/**
- * @file drlg_l3.cpp
- *
- * Implementation of the caves level generation algorithms.
- */
-
 #include <algorithm>
 
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
+#include "levels/setmaps.h"
 #include "lighting.h"
 #include "monster.h"
 #include "objdat.h"
 #include "objects.h"
 #include "quests.h"
-#include "setmaps.h"
 
 namespace devilution {
 

Source/levels/drlg_l3.h

@@ -1,11 +1,11 @@
 /**
- * @file drlg_l3.h
+ * @file levels/drlg_l3.h
  *
  * Interface of the caves level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/levels/drlg_l4.cpp

@@ -1,13 +1,13 @@
 /**
- * @file drlg_l4.cpp
+ * @file levels/drlg_l4.cpp
  *
  * Implementation of the hell level generation algorithms.
  */
-#include "drlg_l4.h"
+#include "levels/drlg_l4.h"
 
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "monster.h"
 #include "multi.h"
 #include "objdat.h"

Source/levels/drlg_l4.h

@@ -1,11 +1,11 @@
 /**
- * @file drlg_l4.h
+ * @file levels/drlg_l4.h
  *
  * Interface of the hell level generation algorithms.
  */
 #pragma once
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/levels/gendung.cpp

@@ -1,22 +1,17 @@
-/**
- * @file gendung.cpp
- *
- * Implementation of general dungeon generation code.
- */
 #include <stack>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l2.h"
+#include "levels/drlg_l3.h"
+#include "levels/drlg_l4.h"
+#include "levels/town.h"
 #include "lighting.h"
 #include "options.h"
-#include "town.h"
 
 namespace devilution {
 

Source/levels/setmaps.cpp

@@ -1,24 +1,19 @@
-/**
- * @file setmaps.cpp
- *
- * Implementation of functionality the special quest dungeons.
- */
-#include "setmaps.h"
+#include "levels/setmaps.h"
 
 #ifdef _DEBUG
 #include "debug.h"
 #endif
-#include "drlg_l1.h"
-#include "drlg_l2.h"
-#include "drlg_l3.h"
-#include "drlg_l4.h"
 #include "engine/load_file.hpp"
-#include "gendung.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l2.h"
+#include "levels/drlg_l3.h"
+#include "levels/drlg_l4.h"
+#include "levels/gendung.h"
+#include "levels/trigs.h"
 #include "objdat.h"
 #include "objects.h"
 #include "palette.h"
 #include "quests.h"
-#include "trigs.h"
 #include "utils/language.h"
 
 namespace devilution {

Source/levels/themes.cpp

@@ -3,16 +3,16 @@
  *
  * Implementation of the theme room placing algorithms.
  */
-#include "themes.h"
+#include "levels/themes.h"
 
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
 #include "items.h"
+#include "levels/trigs.h"
 #include "monster.h"
 #include "objects.h"
 #include "path.h"
 #include "quests.h"
-#include "trigs.h"
 
 namespace devilution {
 

Source/levels/themes.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "objdat.h"
 
 namespace devilution {

Source/levels/town.cpp

@@ -1,17 +1,12 @@
-/**
- * @file town.h
- *
- * Implementation of functionality for rendering the town, towners and calling other render routines.
- */
-#include "town.h"
+#include "levels/town.h"
 
-#include "drlg_l1.h"
 #include "engine/load_file.hpp"
 #include "engine/random.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/trigs.h"
 #include "player.h"
 #include "quests.h"
-#include "trigs.h"
 
 namespace devilution {
 

Source/levels/town.h

@@ -5,8 +5,8 @@
  */
 #pragma once
 
-#include "gendung.h"
 #include "interfac.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/levels/trigs.cpp

@@ -3,7 +3,7 @@
  *
  * Implementation of functionality for triggering events when the player enters an area.
  */
-#include "trigs.h"
+#include "levels/trigs.h"
 
 #include <fmt/format.h>
 

Source/levels/trigs.h

@@ -6,8 +6,8 @@
 #pragma once
 
 #include "engine/point.hpp"
-#include "gendung.h"
 #include "interfac.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/missiles.cpp

@@ -19,10 +19,10 @@
 #include "engine/random.hpp"
 #include "init.h"
 #include "inv.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "monster.h"
 #include "spells.h"
-#include "trigs.h"
 
 namespace devilution {
 

Source/monster.cpp

@@ -14,14 +14,16 @@
 #include "control.h"
 #include "cursor.h"
 #include "dead.h"
-#include "drlg_l1.h"
-#include "drlg_l4.h"
 #include "engine/cel_header.hpp"
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
 #include "engine/render/cl2_render.hpp"
 #include "init.h"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l4.h"
+#include "levels/themes.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "minitext.h"
 #include "missiles.h"
@@ -29,9 +31,7 @@
 #include "options.h"
 #include "spelldat.h"
 #include "storm/storm_net.hpp"
-#include "themes.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/file_name_generator.hpp"
 #include "utils/language.h"
 #include "utils/stdcompat/string_view.hpp"

Source/msg.cpp

@@ -15,11 +15,13 @@
 #include "config.h"
 #include "control.h"
 #include "dead.h"
-#include "drlg_l1.h"
 #include "dthread.h"
 #include "encrypt.h"
 #include "engine/random.hpp"
 #include "gamemenu.h"
+#include "levels/drlg_l1.h"
+#include "levels/town.h"
+#include "levels/trigs.h"
 #include "lighting.h"
 #include "missiles.h"
 #include "nthread.h"
@@ -31,9 +33,7 @@
 #include "storm/storm_net.hpp"
 #include "sync.h"
 #include "tmsg.h"
-#include "town.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/language.h"
 #include "utils/utf8.hpp"
 

Source/objdat.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/objects.cpp

@@ -13,8 +13,6 @@
 #ifdef _DEBUG
 #include "debug.h"
 #endif
-#include "drlg_l1.h"
-#include "drlg_l4.h"
 #include "engine/load_file.hpp"
 #include "engine/points_in_rectangle_range.hpp"
 #include "engine/random.hpp"
@@ -22,14 +20,16 @@
 #include "init.h"
 #include "inv.h"
 #include "inv_iterators.hpp"
+#include "levels/drlg_l1.h"
+#include "levels/drlg_l4.h"
+#include "levels/setmaps.h"
+#include "levels/themes.h"
 #include "lighting.h"
 #include "minitext.h"
 #include "missiles.h"
 #include "monster.h"
 #include "options.h"
-#include "setmaps.h"
 #include "stores.h"
-#include "themes.h"
 #include "towners.h"
 #include "track.h"
 #include "utils/language.h"

Source/palette.h

@@ -7,7 +7,7 @@
 
 #include <cstdint>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/path.cpp

@@ -7,7 +7,7 @@
 
 #include <array>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "objects.h"
 
 namespace devilution {

Source/player.h

@@ -14,9 +14,9 @@
 #include "engine/animationinfo.h"
 #include "engine/cel_sprite.hpp"
 #include "engine/point.hpp"
-#include "gendung.h"
 #include "interfac.h"
 #include "items.h"
+#include "levels/gendung.h"
 #include "multi.h"
 #include "path.h"
 #include "spelldat.h"

Source/portal.h

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "engine/point.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 
 namespace devilution {
 

Source/quests.cpp

@@ -14,8 +14,9 @@
 #include "engine/random.hpp"
 #include "engine/render/cel_render.hpp"
 #include "engine/render/text_render.hpp"
-#include "gendung.h"
 #include "init.h"
+#include "levels/gendung.h"
+#include "levels/trigs.h"
 #include "minitext.h"
 #include "missiles.h"
 #include "monster.h"
@@ -23,7 +24,6 @@
 #include "panels/ui_panels.hpp"
 #include "stores.h"
 #include "towners.h"
-#include "trigs.h"
 #include "utils/language.h"
 #include "utils/utf8.hpp"
 

Source/quests.h

@@ -10,7 +10,7 @@
 #include "engine.h"
 #include "engine/cel_sprite.hpp"
 #include "engine/point.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "monster.h"
 #include "objdat.h"
 #include "panels/info_box.hpp"

Source/sound.h

@@ -9,7 +9,7 @@
 #include <memory>
 #include <string>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "miniwin/miniwin.h"
 
 #ifndef NOSOUND

Source/sync.cpp

@@ -5,7 +5,7 @@
  */
 #include <climits>
 
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "monster.h"
 #include "player.h"
 

test/dead_test.cpp

@@ -2,7 +2,7 @@
 
 #include "dead.h"
 #include "engine.h"
-#include "gendung.h"
+#include "levels/gendung.h"
 
 using namespace devilution;
 

test/drlg_l2_test.cpp

@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "quests.h"
 
 using namespace devilution;

test/drlg_l3_test.cpp

@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "quests.h"
 
 using namespace devilution;

test/drlg_l4_test.cpp

@@ -2,7 +2,7 @@
 #include <gtest/gtest.h>
 
 #include "drlg_test.hpp"
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "multi.h"
 #include "quests.h"
 

test/drlg_test.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "engine/load_file.hpp"
-#include "themes.h"
+#include "levels/themes.h"
 #include "utils/paths.h"
 
 using namespace devilution;

test/path_test.cpp

@@ -3,7 +3,7 @@
 #include "path.h"
 
 // The following headers are included to access globals used in functions that have not been isolated yet.
-#include "gendung.h"
+#include "levels/gendung.h"
 #include "objects.h"
 
 namespace devilution {