From 3f90764faa17f40dd9f587f891810a67dd3291aa Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Fri, 1 Feb 2019 18:13:12 +0100
Subject: [PATCH] - moved the contents of g_inventory to g_shared and gamedata
 subfolders.

a_pickups only contains a few native remains of the inventory code and the other two only the static data maintenance for their items.
---
 src/CMakeLists.txt                          | 11 ++++++-----
 src/{g_inventory => g_shared}/a_pickups.cpp |  0
 src/{g_inventory => g_shared}/a_pickups.h   |  0
 src/{g_inventory => gamedata}/a_keys.cpp    |  0
 src/{g_inventory => gamedata}/a_keys.h      |  0
 src/{g_inventory => gamedata}/a_weapons.cpp |  0
 src/{g_inventory => gamedata}/a_weapons.h   |  0
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename src/{g_inventory => g_shared}/a_pickups.cpp (100%)
 rename src/{g_inventory => g_shared}/a_pickups.h (100%)
 rename src/{g_inventory => gamedata}/a_keys.cpp (100%)
 rename src/{g_inventory => gamedata}/a_keys.h (100%)
 rename src/{g_inventory => gamedata}/a_weapons.cpp (100%)
 rename src/{g_inventory => gamedata}/a_weapons.h (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cd4d922df..57f059030 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -647,7 +647,7 @@ file( GLOB HEADER_FILES
 	fragglescript/*.h
 	g_shared/*.h
 	g_statusbar/*.h
-	g_inventory/*.h
+	gamedata/*.h
 	intermission/*.h
 	maploader/*.h
 	menu/*.h
@@ -973,9 +973,9 @@ set (PCH_SOURCES
 	v_video.cpp
 	w_wad.cpp
 	wi_stuff.cpp
-	g_inventory/a_keys.cpp
-	g_inventory/a_pickups.cpp
-	g_inventory/a_weapons.cpp
+	gamedata/a_keys.cpp
+	gamedata/a_weapons.cpp
+	g_shared/a_pickups.cpp
 	g_shared/a_action.cpp
 	g_shared/a_decals.cpp
 	g_shared/a_doors.cpp
@@ -1321,7 +1321,7 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
 include_directories( .
 	g_statusbar
 	g_shared
-	g_inventory
+	gamedata
 	rendering
 	sound
 	textures
@@ -1439,6 +1439,7 @@ source_group("External\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/m
 source_group("External\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/.+")
 source_group("External\\SFMT" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sfmt/.+")
 source_group("FraggleScript" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/fragglescript/.+")
+source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+")
 source_group("Intermission" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/intermission/.+")
 source_group("Map Loader" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/maploader/.+")
 source_group("Menu" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/menu/.+")
diff --git a/src/g_inventory/a_pickups.cpp b/src/g_shared/a_pickups.cpp
similarity index 100%
rename from src/g_inventory/a_pickups.cpp
rename to src/g_shared/a_pickups.cpp
diff --git a/src/g_inventory/a_pickups.h b/src/g_shared/a_pickups.h
similarity index 100%
rename from src/g_inventory/a_pickups.h
rename to src/g_shared/a_pickups.h
diff --git a/src/g_inventory/a_keys.cpp b/src/gamedata/a_keys.cpp
similarity index 100%
rename from src/g_inventory/a_keys.cpp
rename to src/gamedata/a_keys.cpp
diff --git a/src/g_inventory/a_keys.h b/src/gamedata/a_keys.h
similarity index 100%
rename from src/g_inventory/a_keys.h
rename to src/gamedata/a_keys.h
diff --git a/src/g_inventory/a_weapons.cpp b/src/gamedata/a_weapons.cpp
similarity index 100%
rename from src/g_inventory/a_weapons.cpp
rename to src/gamedata/a_weapons.cpp
diff --git a/src/g_inventory/a_weapons.h b/src/gamedata/a_weapons.h
similarity index 100%
rename from src/g_inventory/a_weapons.h
rename to src/gamedata/a_weapons.h