Skip to content

Commit 2ba2857

Browse files
refactor: reorganize procgen sources
Assisted-by: openai/gpt-5.4 on opencode Co-authored-by: chatgpt-codex-connector[bot] <199175422+chatgpt-codex-connector[bot]@users.noreply.github.com>
1 parent d6135f7 commit 2ba2857

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+4751
-43
lines changed

src/CMakeLists.txt

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ set(MAIN_CPP ${CMAKE_SOURCE_DIR}/src/main.cpp)
22
set(MESSAGES_CPP ${CMAKE_SOURCE_DIR}/src/messages.cpp)
33
set(RESOURCE_RC ${CMAKE_SOURCE_DIR}/src/resource.rc)
44

5-
file(GLOB CATACLYSM_BN_SOURCES CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/src/*.cpp)
5+
file(GLOB CATACLYSM_BN_SOURCES CONFIGURE_DEPENDS
6+
${CMAKE_SOURCE_DIR}/src/*.cpp
7+
${CMAKE_SOURCE_DIR}/src/procgen/*.cpp)
68

79
list(REMOVE_ITEM CATACLYSM_BN_SOURCES ${MAIN_CPP} ${MESSAGES_CPP})
810

@@ -18,7 +20,9 @@ foreach (catalua_src IN LISTS CATALUA_BINDINGS_SOURCES)
1820
set_source_files_properties(${catalua_src} PROPERTIES COMPILE_OPTIONS "${CATALUA_BINDINGS_COMPILE_OPTIONS}")
1921
endforeach ()
2022

21-
file(GLOB CATACLYSM_BN_HEADERS CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/src/*.h)
23+
file(GLOB CATACLYSM_BN_HEADERS CONFIGURE_DEPENDS
24+
${CMAKE_SOURCE_DIR}/src/*.h
25+
${CMAKE_SOURCE_DIR}/src/procgen/*.h)
2226

2327
add_subdirectory(lua)
2428
add_subdirectory(sol)
@@ -108,7 +112,7 @@ if (TILES)
108112
cataclysm-bn-tiles-common OBJECT
109113
${CATACLYSM_BN_SOURCES}
110114
${CATACLYSM_BN_HEADERS})
111-
target_include_directories(cataclysm-bn-tiles-common INTERFACE ${CMAKE_SOURCE_DIR}/src)
115+
target_include_directories(cataclysm-bn-tiles-common PUBLIC ${CMAKE_SOURCE_DIR}/src)
112116

113117
if (WIN32)
114118
add_definitions(-DUSE_WINMAIN)
@@ -189,7 +193,7 @@ if (CURSES)
189193
add_library(cataclysm-bn-common OBJECT
190194
${CATACLYSM_BN_SOURCES}
191195
${CATACLYSM_BN_HEADERS})
192-
target_include_directories(cataclysm-bn-common INTERFACE ${CMAKE_SOURCE_DIR}/src)
196+
target_include_directories(cataclysm-bn-common PUBLIC ${CMAKE_SOURCE_DIR}/src)
193197

194198
if (WIN32)
195199
add_executable(cataclysm-bn

src/consumption.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "mutation.h"
3838
#include "options.h"
3939
#include "pldata.h"
40-
#include "proc_item.h"
40+
#include "procgen/proc_item.h"
4141
#include "recipe.h"
4242
#include "recipe_dictionary.h"
4343
#include "requirements.h"

src/crafting.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
#include "pimpl.h"
5858
#include "player.h"
5959
#include "player_activity.h"
60-
#include "proc_fact.h"
61-
#include "proc_item.h"
62-
#include "proc_recipe.h"
63-
#include "proc_ui.h"
60+
#include "procgen/proc_fact.h"
61+
#include "procgen/proc_item.h"
62+
#include "procgen/proc_recipe.h"
63+
#include "procgen/proc_ui.h"
6464
#include "popup.h"
6565
#include "point.h"
6666
#include "recipe.h"

src/crafting_gui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "output.h"
3434
#include "player.h"
3535
#include "point.h"
36-
#include "proc_recipe.h"
36+
#include "procgen/proc_recipe.h"
3737
#include "recipe.h"
3838
#include "recipe_dictionary.h"
3939
#include "requirements.h"

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
#include "overmap_location.h"
8787
#include "overmap_special.h"
8888
#include "profession.h"
89-
#include "proc_schema.h"
89+
#include "procgen/proc_schema.h"
9090
#include "recipe_dictionary.h"
9191
#include "recipe_groups.h"
9292
#include "regional_settings.h"

src/item.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
#include "overmapbuffer.h"
8686
#include "pimpl.h"
8787
#include "player.h"
88-
#include "proc_item.h"
88+
#include "procgen/proc_item.h"
8989
#include "player_activity.h"
9090
#include "pldata.h"
9191
#include "point.h"

src/item_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#include "item.h"
3838
#include "item_contents.h"
3939
#include "item_group.h"
40-
#include "proc_item.h"
40+
#include "procgen/proc_item.h"
4141
#include "iuse_actor.h"
4242
#include "json.h"
4343
#include "point.h"

src/melee.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#include "pldata.h"
5959
#include "point.h"
6060
#include "projectile.h"
61-
#include "proc_item.h"
61+
#include "procgen/proc_item.h"
6262
#include "rng.h"
6363
#include "sounds.h"
6464
#include "string_formatter.h"

0 commit comments

Comments
 (0)