From 014e04ce820a67aae7cb925edb8917c7d7c3c450 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 30 Nov 2016 10:28:02 +0100 Subject: [PATCH] - copied inventory files to their own folder. It's about time this stuff is getting cleaned up seriously. Both a_pickups.cpp and a_artifacts.cpp are so overstuffed that it has become a chore finding stuff in there. --- src/CMakeLists.txt | 17 ++++++++++------- src/{g_shared => g_inventory}/a_armor.cpp | 0 src/{g_shared => g_inventory}/a_artifacts.cpp | 0 src/{g_shared => g_inventory}/a_artifacts.h | 0 src/{g_shared => g_inventory}/a_keys.cpp | 0 src/{g_shared => g_inventory}/a_keys.h | 0 src/{g_shared => g_inventory}/a_pickups.cpp | 0 src/{g_shared => g_inventory}/a_pickups.h | 0 src/{g_shared => g_inventory}/a_puzzleitems.cpp | 0 src/{g_shared => g_inventory}/a_weaponpiece.cpp | 0 src/{g_shared => g_inventory}/a_weaponpiece.h | 0 src/{g_shared => g_inventory}/a_weapons.cpp | 0 src/p_acs.cpp | 3 +-- 13 files changed, 11 insertions(+), 9 deletions(-) rename src/{g_shared => g_inventory}/a_armor.cpp (100%) rename src/{g_shared => g_inventory}/a_artifacts.cpp (100%) rename src/{g_shared => g_inventory}/a_artifacts.h (100%) rename src/{g_shared => g_inventory}/a_keys.cpp (100%) rename src/{g_shared => g_inventory}/a_keys.h (100%) rename src/{g_shared => g_inventory}/a_pickups.cpp (100%) rename src/{g_shared => g_inventory}/a_pickups.h (100%) rename src/{g_shared => g_inventory}/a_puzzleitems.cpp (100%) rename src/{g_shared => g_inventory}/a_weaponpiece.cpp (100%) rename src/{g_shared => g_inventory}/a_weaponpiece.h (100%) rename src/{g_shared => g_inventory}/a_weapons.cpp (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d1e90581c7..be6c0ac730 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -829,6 +829,7 @@ file( GLOB HEADER_FILES ${EXTRA_HEADER_DIRS} fragglescript/*.h g_shared/*.h + g_inventory/*.h g_strife/*.h intermission/*.h menu/*.h @@ -1106,21 +1107,23 @@ set (PCH_SOURCES w_wad.cpp wi_stuff.cpp zstrformat.cpp + g_inventory/a_armor.cpp + g_inventory/a_artifacts.cpp + g_inventory/a_keys.cpp + g_inventory/a_pickups.cpp + g_inventory/a_puzzleitems.cpp + g_inventory/a_weaponpiece.cpp + g_inventory/a_weapons.cpp g_strife/strife_sbar.cpp g_shared/a_action.cpp - g_shared/a_armor.cpp - g_shared/a_artifacts.cpp g_shared/a_bridge.cpp g_shared/a_decals.cpp g_shared/a_fastprojectile.cpp g_shared/a_flashfader.cpp g_shared/a_fountain.cpp - g_shared/a_keys.cpp g_shared/a_lightning.cpp g_shared/a_morph.cpp g_shared/a_movingcamera.cpp - g_shared/a_pickups.cpp - g_shared/a_puzzleitems.cpp g_shared/a_quake.cpp g_shared/a_randomspawner.cpp g_shared/a_sectoraction.cpp @@ -1128,8 +1131,6 @@ set (PCH_SOURCES g_shared/a_soundenvironment.cpp g_shared/a_soundsequence.cpp g_shared/a_specialspot.cpp - g_shared/a_weaponpiece.cpp - g_shared/a_weapons.cpp g_shared/hudmessages.cpp g_shared/sbarinfo.cpp g_shared/sbar_mugshot.cpp @@ -1250,6 +1251,7 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma ) include_directories( . g_strife g_shared + g_inventory oplsynth sound textures @@ -1380,6 +1382,7 @@ source_group("Externak\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/s source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+") source_group("Games\\Strife Game" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_strife/.+") source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+") +source_group("Inventory" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/g_inventory/.+") source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+") source_group("Render Core\\Render Headers" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.h$") source_group("Render Core\\Render Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/r_.+\\.cpp$") diff --git a/src/g_shared/a_armor.cpp b/src/g_inventory/a_armor.cpp similarity index 100% rename from src/g_shared/a_armor.cpp rename to src/g_inventory/a_armor.cpp diff --git a/src/g_shared/a_artifacts.cpp b/src/g_inventory/a_artifacts.cpp similarity index 100% rename from src/g_shared/a_artifacts.cpp rename to src/g_inventory/a_artifacts.cpp diff --git a/src/g_shared/a_artifacts.h b/src/g_inventory/a_artifacts.h similarity index 100% rename from src/g_shared/a_artifacts.h rename to src/g_inventory/a_artifacts.h diff --git a/src/g_shared/a_keys.cpp b/src/g_inventory/a_keys.cpp similarity index 100% rename from src/g_shared/a_keys.cpp rename to src/g_inventory/a_keys.cpp diff --git a/src/g_shared/a_keys.h b/src/g_inventory/a_keys.h similarity index 100% rename from src/g_shared/a_keys.h rename to src/g_inventory/a_keys.h diff --git a/src/g_shared/a_pickups.cpp b/src/g_inventory/a_pickups.cpp similarity index 100% rename from src/g_shared/a_pickups.cpp rename to src/g_inventory/a_pickups.cpp diff --git a/src/g_shared/a_pickups.h b/src/g_inventory/a_pickups.h similarity index 100% rename from src/g_shared/a_pickups.h rename to src/g_inventory/a_pickups.h diff --git a/src/g_shared/a_puzzleitems.cpp b/src/g_inventory/a_puzzleitems.cpp similarity index 100% rename from src/g_shared/a_puzzleitems.cpp rename to src/g_inventory/a_puzzleitems.cpp diff --git a/src/g_shared/a_weaponpiece.cpp b/src/g_inventory/a_weaponpiece.cpp similarity index 100% rename from src/g_shared/a_weaponpiece.cpp rename to src/g_inventory/a_weaponpiece.cpp diff --git a/src/g_shared/a_weaponpiece.h b/src/g_inventory/a_weaponpiece.h similarity index 100% rename from src/g_shared/a_weaponpiece.h rename to src/g_inventory/a_weaponpiece.h diff --git a/src/g_shared/a_weapons.cpp b/src/g_inventory/a_weapons.cpp similarity index 100% rename from src/g_shared/a_weapons.cpp rename to src/g_inventory/a_weapons.cpp diff --git a/src/p_acs.cpp b/src/p_acs.cpp index a711106742..96949dd965 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -82,8 +82,7 @@ #include "i_music.h" #include "serializer.h" #include "thingdef.h" - -#include "g_shared/a_pickups.h" +#include "a_pickups.h" extern FILE *Logfile;