- moved file system implementation to 'common'.

src/CMakeLists.txt

@@ -611,6 +611,7 @@ file( GLOB HEADER_FILES
 	r_data/*.h
 	r_data/models/*.h
 	common/utility/*.h
+	common/filesystem/*.h
 	common/thirdparty/*.h
 	common/thirdparty/rapidjson/*.h
 	common/thirdparty/math./*h
@@ -902,7 +903,6 @@ set (PCH_SOURCES
 	gamedata/gi.cpp
 	gamedata/stringtable.cpp
 	gamedata/umapinfo.cpp
-	gamedata/w_wad.cpp
 	gamedata/d_dehacked.cpp
 	gamedata/g_doomedmap.cpp
 	gamedata/info.cpp
@@ -1010,17 +1010,6 @@ set (PCH_SOURCES
 	menu/optionmenu.cpp
 	menu/playermenu.cpp
 	menu/resolutionmenu.cpp
-	gamedata/resourcefiles/ancientzip.cpp
-	gamedata/resourcefiles/file_7z.cpp
-	gamedata/resourcefiles/file_grp.cpp
-	gamedata/resourcefiles/file_lump.cpp
-	gamedata/resourcefiles/file_rff.cpp
-	gamedata/resourcefiles/file_wad.cpp
-	gamedata/resourcefiles/file_zip.cpp
-	gamedata/resourcefiles/file_pak.cpp
-	gamedata/resourcefiles/file_whres.cpp
-	gamedata/resourcefiles/file_directory.cpp
-	gamedata/resourcefiles/resourcefile.cpp
 	gamedata/textures/animations.cpp
 	gamedata/textures/anim_switches.cpp
 	gamedata/textures/bitmap.cpp
@@ -1138,6 +1127,19 @@ set (PCH_SOURCES
 	common/utility/zstrformat.cpp
 	common/thirdparty/md5.cpp
  	common/thirdparty/superfasthash.cpp
+	common/filesystem/filesystem.cpp
+	common/filesystem/ancientzip.cpp
+	common/filesystem/file_7z.cpp
+	common/filesystem/file_grp.cpp
+	common/filesystem/file_lump.cpp
+	common/filesystem/file_rff.cpp
+	common/filesystem/file_wad.cpp
+	common/filesystem/file_zip.cpp
+	common/filesystem/file_pak.cpp
+	common/filesystem/file_whres.cpp
+	common/filesystem/file_directory.cpp
+	common/filesystem/resourcefile.cpp
+	
 	utility/m_png.cpp
 	utility/m_random.cpp
 	utility/nodebuilder/nodebuild.cpp
@@ -1220,6 +1222,7 @@ target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa lzma ${ZMUSIC_LIBRARIES} )
 
 include_directories( .
 	common/thirdparty
+	common/filesystem
 	common/utility
 	g_statusbar
 	console
@@ -1348,7 +1351,6 @@ source_group("Audio Files\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_
 source_group("Audio Files\\Music formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/musicformats/.+")
 source_group("Audio Files\\Third-party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/thirdparty/.+")
 source_group("Game Data" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/.+")
-source_group("Game Data\\Resource Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/resourcefiles/.+")
 source_group("Game Data\\Fonts" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/fonts/.+")
 source_group("Game Data\\Textures" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/textures/.+")
 source_group("Game Data\\Textures\\Hires" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/gamedata/textures/hires/.+")
@@ -1422,6 +1424,7 @@ source_group("Scripting\\VM" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sc
 source_group("Scripting" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/scripting/.+")
 source_group("Common" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/.+")
 source_group("Common\\Utility" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/utility/.+")
+source_group("Common\\File System" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/filesystem/.+")
 source_group("Common\\Third Party" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/.+")
 source_group("Common\\Third Party\\Math" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/math/.+")
 source_group("Common\\Third Party\\RapidJSON" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/common/thirdparty/rapidjson/.+")

src/am_map.cpp

@@ -34,7 +34,7 @@
 #include "st_stuff.h"
 #include "p_local.h"
 #include "p_lnspec.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "a_sharedglobal.h"
 #include "d_event.h"
 #include "gi.h"

src/common/filesystem/file_wad.cpp

@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include "resourcefile.h"
 #include "v_text.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "engineerrors.h"
 
 

src/common/filesystem/filesystem.cpp

@@ -42,10 +42,9 @@
 
 #include "m_argv.h"
 #include "cmdlib.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "m_crc32.h"
 #include "printf.h"
-#include "resourcefiles/resourcefile.h"
 #include "md5.h"
 
 extern	FILE* hashfile;

src/common/filesystem/filesystem.h

@@ -13,7 +13,7 @@
 #include "tarray.h"
 #include "cmdlib.h"
 #include "zstring.h"
-#include "resourcefiles/resourcefile.h"
+#include "resourcefile.h"
 
 class FResourceFile;
 struct FResourceLump;

src/console/c_bind.cpp

@@ -40,7 +40,7 @@
 #include "hu_stuff.h"
 #include "configfile.h"
 #include "d_event.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 #include "dobject.h"
 #include "vm.h"

src/console/c_cmds.cpp

@@ -54,7 +54,7 @@
 #include "s_sound.h"
 #include "g_game.h"
 #include "g_level.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "gi.h"
 #include "r_defs.h"
 #include "d_player.h"

src/console/c_console.cpp

@@ -50,7 +50,7 @@
 #include "v_palette.h"
 #include "v_video.h"
 #include "v_text.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "sbar.h"
 #include "s_sound.h"
 #include "doomstat.h"

src/d_iwad.cpp

@@ -37,7 +37,7 @@
 #include "cmdlib.h"
 #include "doomstat.h"
 #include "i_system.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "m_argv.h"
 #include "m_misc.h"
 #include "sc_man.h"

src/d_main.cpp

@@ -50,7 +50,7 @@
 #include "doomdef.h"
 #include "doomstat.h"
 #include "gstrings.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "s_sound.h"
 #include "v_video.h"
 #include "intermission/intermission.h"

src/g_dumpinfo.cpp

@@ -39,7 +39,7 @@
 #include "a_sharedglobal.h"
 #include "d_net.h"
 #include "p_setup.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_text.h"
 #include "c_functions.h"
 #include "gstrings.h"

src/g_game.cpp

@@ -50,7 +50,7 @@
 #include "c_console.h"
 #include "c_bind.h"
 #include "c_dispatch.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "p_local.h" 
 #include "gstrings.h"
 #include "r_sky.h"

src/g_level.cpp

@@ -43,7 +43,7 @@
 #include "engineerrors.h"
 #include "doomstat.h"
 #include "wi_stuff.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "am_map.h"
 #include "c_dispatch.h"
 

src/g_level.h

@@ -3,7 +3,7 @@
 #include "doomtype.h"
 #include "vectors.h"
 #include "sc_man.h"
-#include "resourcefiles/file_zip.h"
+#include "file_zip.h"
 #include "g_mapinfo.h"
 
 

src/g_statusbar/sbarinfo.cpp

@@ -38,7 +38,7 @@
 #include "v_font.h"
 #include "v_video.h"
 #include "sbar.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "d_player.h"
 #include "a_keys.h"
 #include "sbarinfo.h"

src/g_statusbar/shared_hud.cpp

@@ -35,7 +35,7 @@
 #include "doomdef.h"
 #include "v_video.h"
 #include "gi.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "a_keys.h"
 #include "sbar.h"
 #include "sc_man.h"

src/g_statusbar/shared_sbar.cpp

@@ -41,7 +41,7 @@
 #include "c_dispatch.h"
 #include "c_console.h"
 #include "v_video.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "s_sound.h"
 #include "gi.h"
 #include "doomstat.h"

src/gamedata/a_keys.cpp

@@ -37,7 +37,7 @@
 #include "gstrings.h"
 #include "d_player.h"
 #include "c_console.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_font.h"
 #include "vm.h"
 

src/gamedata/d_dehacked.cpp

@@ -51,7 +51,7 @@
 #include "g_level.h"
 #include "cmdlib.h"
 #include "gstrings.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "d_player.h"
 #include "r_state.h"
 #include "c_dispatch.h"

src/gamedata/decallib.cpp

@@ -34,7 +34,7 @@
 
 #include "decallib.h"
 #include "sc_man.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_video.h"
 #include "cmdlib.h"
 #include "m_random.h"

src/gamedata/fonts/font.cpp

@@ -45,7 +45,7 @@
 #include "m_swap.h"
 #include "v_font.h"
 #include "v_video.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "gi.h"
 #include "cmdlib.h"
 #include "sc_man.h"

src/gamedata/fonts/hexfont.cpp

@@ -36,7 +36,7 @@
 #include "textures.h"
 #include "image.h"
 #include "v_font.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "utf8.h"
 #include "sc_man.h"
 

src/gamedata/fonts/singlelumpfont.cpp

@@ -37,7 +37,7 @@
 #include "textures.h"
 #include "image.h"
 #include "v_font.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "utf8.h"
 #include "textures/formats/fontchars.h"
 

src/gamedata/fonts/singlepicfont.cpp

@@ -36,7 +36,7 @@
 #include "engineerrors.h"
 #include "textures.h"
 #include "v_font.h"
-#include "w_wad.h"
+#include "filesystem.h"
 
 class FSinglePicFont : public FFont
 {

src/gamedata/fonts/v_font.cpp

@@ -44,7 +44,7 @@
 #include "m_swap.h"
 #include "v_font.h"
 #include "v_video.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "gi.h"
 #include "cmdlib.h"
 #include "sc_man.h"

src/gamedata/fonts/v_font.h

@@ -35,7 +35,7 @@
 #define __V_FONT_H__
 
 #include "doomtype.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "vectors.h"
 
 class DCanvas;

src/gamedata/fonts/v_text.cpp

@@ -42,7 +42,7 @@
 
 
 #include "v_video.h"
-#include "w_wad.h"
+#include "filesystem.h"
 
 #include "gstrings.h"
 #include "vm.h"

src/gamedata/g_mapinfo.cpp

@@ -36,7 +36,7 @@
 #include <assert.h>
 #include "templates.h"
 #include "g_level.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "cmdlib.h"
 #include "v_video.h"
 #include "p_lnspec.h"

src/gamedata/g_mapinfo.h

@@ -37,7 +37,7 @@
 #include "doomtype.h"
 #include "vectors.h"
 #include "sc_man.h"
-#include "resourcefiles/file_zip.h"
+#include "file_zip.h"
 
 struct level_info_t;
 struct cluster_info_t;

src/gamedata/gi.cpp

@@ -36,7 +36,7 @@
 #include "info.h"
 #include "gi.h"
 #include "sc_man.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_video.h"
 #include "g_level.h"
 #include "vm.h"

src/gamedata/info.cpp

@@ -50,7 +50,7 @@
 #include "d_player.h"
 #include "events.h"
 #include "types.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "g_levellocals.h"
 
 extern void LoadActors ();

src/gamedata/keysections.cpp

@@ -39,7 +39,7 @@
 #include "c_bind.h"
 #include "c_dispatch.h"
 #include "gameconfigfile.h"
-#include "w_wad.h"
+#include "filesystem.h"
 
 TArray<FKeySection> KeySections;
 extern TArray<FString> KeyConfWeapons;

src/gamedata/p_terrain.cpp

@@ -41,7 +41,7 @@
 #include "p_terrain.h"
 #include "gi.h"
 #include "r_state.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "sc_man.h"
 #include "p_local.h"
 #include "actor.h"

src/gamedata/statistics.cpp

@@ -46,7 +46,7 @@
 #include "g_game.h"
 #include "m_png.h"
 #include "engineerrors.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "p_local.h"
 #include "p_setup.h"
 #include "s_sound.h"

src/gamedata/stringtable.cpp

@@ -36,7 +36,7 @@
 
 #include "stringtable.h"
 #include "cmdlib.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "i_system.h"
 #include "sc_man.h"
 #include "c_dispatch.h"

src/gamedata/teaminfo.cpp

@@ -40,7 +40,7 @@
 #include "teaminfo.h"
 #include "v_font.h"
 #include "v_video.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "vm.h"
 
 // MACROS ------------------------------------------------------------------

src/gamedata/textures/anim_switches.cpp

@@ -36,7 +36,7 @@
 #include "textures/textures.h"
 #include "s_sound.h"
 #include "r_state.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "cmdlib.h"
 #include "sc_man.h"
 #include "gi.h"

src/gamedata/textures/animations.cpp

@@ -39,7 +39,7 @@
 #include "m_random.h"
 #include "d_player.h"
 #include "p_spec.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "serializer.h"
 
 // MACROS ------------------------------------------------------------------

src/gamedata/textures/formats/automaptexture.cpp

@@ -37,7 +37,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "textures/textures.h"
 #include "imagehelpers.h"
 #include "image.h"

src/gamedata/textures/formats/brightmaptexture.cpp

@@ -34,7 +34,7 @@
 */
 
 #include "doomtype.h"
-#include "w_wad.h"
+#include "filesystem.h"
 
 #include "r_data/r_translate.h"
 #include "bitmap.h"

src/gamedata/textures/formats/buildtexture.cpp

@@ -36,14 +36,14 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 #include "cmdlib.h"
 #include "colormatcher.h"
 #include "bitmap.h"
 #include "textures/textures.h"
 #include "r_data/sprites.h"
-#include "resourcefiles/resourcefile.h"
+#include "resourcefile.h"
 #include "image.h"
 
 

src/gamedata/textures/formats/ddstexture.cpp

@@ -50,7 +50,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "bitmap.h"
 #include "v_video.h"
 #include "imagehelpers.h"

src/gamedata/textures/formats/emptytexture.cpp

@@ -37,7 +37,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "textures/textures.h"
 #include "image.h"
 

src/gamedata/textures/formats/flattexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "textures/textures.h"
 #include "imagehelpers.h"
 #include "image.h"

src/gamedata/textures/formats/fontchars.cpp

@@ -35,7 +35,7 @@
 */
 
 #include "doomtype.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_palette.h"
 #include "v_video.h"
 #include "bitmap.h"

src/gamedata/textures/formats/imgztexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_video.h"
 #include "bitmap.h"
 #include "imagehelpers.h"

src/gamedata/textures/formats/jpegtexture.cpp

@@ -41,7 +41,7 @@ extern "C"
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_text.h"
 #include "bitmap.h"
 #include "v_video.h"

src/gamedata/textures/formats/multipatchtexture.cpp

@@ -36,7 +36,7 @@
 #include <ctype.h>
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 
 #include "gi.h"
 #include "st_start.h"

src/gamedata/textures/formats/patchtexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_palette.h"
 #include "v_video.h"
 #include "bitmap.h"

src/gamedata/textures/formats/pcxtexture.cpp

@@ -36,7 +36,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "bitmap.h"
 #include "v_video.h"
 #include "imagehelpers.h"

src/gamedata/textures/formats/pngtexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 #include "m_png.h"
 #include "bitmap.h"

src/gamedata/textures/formats/rawpagetexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "gi.h"
 #include "bitmap.h"
 #include "textures/textures.h"

src/gamedata/textures/formats/shadertexture.cpp

@@ -37,7 +37,7 @@
 #include "doomtype.h"
 #include "d_player.h"
 #include "menu/menu.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "bitmap.h"
 #include "imagehelpers.h"
 #include "image.h"

src/gamedata/textures/formats/stbtexture.cpp

@@ -47,7 +47,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_video.h"
 #include "bitmap.h"
 #include "imagehelpers.h"

src/gamedata/textures/formats/tgatexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 #include "bitmap.h"
 #include "v_video.h"

src/gamedata/textures/image.cpp

@@ -37,7 +37,7 @@
 #include "v_video.h"
 #include "bitmap.h"
 #include "image.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "files.h"
 #include "cmdlib.h"
 

src/gamedata/textures/imagetexture.cpp

@@ -35,7 +35,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 #include "bitmap.h"
 #include "v_video.h"

src/gamedata/textures/multipatchtexturebuilder.cpp

@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 
 #include "gi.h"
 #include "st_start.h"

src/gamedata/textures/skyboxtexture.cpp

@@ -21,7 +21,7 @@
 //
 
 #include "doomtype.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "textures.h"
 #include "skyboxtexture.h"
 #include "bitmap.h"

src/gamedata/textures/texture.cpp

@@ -36,7 +36,7 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 
 #include "r_data/r_translate.h"

src/gamedata/textures/texturemanager.cpp

@@ -36,7 +36,7 @@
 
 #include "doomtype.h"
 #include "doomstat.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "templates.h"
 #include "i_system.h"
 #include "gstrings.h"

src/gamedata/umapinfo.cpp

@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "w_wad.h"
+#include "filesystem.h"
 #include "g_level.h"
 #include "r_defs.h"
 #include "p_setup.h"

src/gamedata/xlat/parsecontext.cpp

@@ -35,7 +35,7 @@
 
 #include <string.h>
 #include <ctype.h>
-#include "w_wad.h"
+#include "filesystem.h"
 #include "parsecontext.h"
 #include "p_lnspec.h"
 

src/intermission/intermission.cpp

@@ -35,7 +35,7 @@
 #include "doomtype.h"
 #include "g_game.h"
 #include "d_event.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "gi.h"
 #include "v_video.h"
 #include "d_main.h"

src/intermission/intermission_parse.cpp

@@ -37,7 +37,7 @@
 #include <ctype.h>
 #include "intermission/intermission.h"
 #include "g_level.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "c_dispatch.h"
 #include "gstrings.h"
 #include "gi.h"

src/m_misc.cpp

@@ -45,7 +45,7 @@
 #include "m_swap.h"
 #include "m_argv.h"
 
-#include "w_wad.h"
+#include "filesystem.h"
 
 #include "c_cvars.h"
 #include "c_dispatch.h"

src/maploader/compatibility.cpp

@@ -47,7 +47,7 @@
 #include "g_level.h"
 #include "p_lnspec.h"
 #include "p_tags.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "textures.h"
 #include "g_levellocals.h"
 #include "actor.h"

src/maploader/edata.cpp

@@ -34,7 +34,7 @@
 **
 */
 
-#include "w_wad.h"
+#include "filesystem.h"
 #include "m_argv.h"
 #include "sc_man.h"
 #include "g_level.h"

src/maploader/glnodes.cpp

@@ -47,7 +47,7 @@
 #include "m_argv.h"
 #include "c_dispatch.h"
 #include "m_swap.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "p_local.h"
 #include "nodebuild.h"
 #include "doomstat.h"

src/maploader/maploader.cpp

@@ -70,7 +70,7 @@
 #include "gi.h"
 #include "engineerrors.h"
 #include "types.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "p_conversation.h"
 #include "v_video.h"
 #include "i_time.h"

src/maploader/postprocessor.cpp

@@ -39,7 +39,7 @@
 #include "g_level.h"
 #include "p_lnspec.h"
 #include "p_tags.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "textures.h"
 #include "g_levellocals.h"
 #include "actor.h"

src/maploader/strifedialogue.cpp

@@ -37,7 +37,7 @@
 
 #include "actor.h"
 #include "p_conversation.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "cmdlib.h"
 #include "v_text.h"
 #include "gi.h"

src/maploader/udmf.cpp

@@ -42,7 +42,7 @@
 #include "g_level.h"
 #include "udmf.h"
 #include "r_state.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "p_tags.h"
 #include "p_terrain.h"
 #include "p_spec.h"

src/maploader/usdf.cpp

@@ -39,7 +39,7 @@
 #include "engineerrors.h"
 #include "actor.h"
 #include "a_pickups.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "g_levellocals.h"
 #include "maploader.h"
 

src/menu/loadsavemenu.cpp

@@ -37,7 +37,7 @@
 #include "version.h"
 #include "g_game.h"
 #include "m_png.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "v_text.h"
 #include "gstrings.h"
 #include "serializer.h"

src/menu/menudef.cpp

@@ -34,7 +34,7 @@
 #include <float.h>
 
 #include "menu/menu.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "c_bind.h"
 #include "i_music.h"
 #include "gi.h"

src/p_conversation.cpp

@@ -36,7 +36,7 @@
 
 #include "actor.h"
 #include "p_conversation.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "cmdlib.h"
 #include "v_text.h"
 #include "gi.h"

src/p_openmap.cpp

@@ -37,7 +37,7 @@
 #include "p_setup.h"
 
 #include "cmdlib.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "md5.h"
 #include "g_levellocals.h"
 #include "cmdlib.h"

src/p_setup.cpp

@@ -34,7 +34,7 @@
 #include "d_player.h"
 #include "m_argv.h"
 #include "g_game.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "p_local.h"
 #include "p_effect.h"
 #include "p_terrain.h"

src/p_setup.h

@@ -28,7 +28,7 @@
 #ifndef __P_SETUP__
 #define __P_SETUP__
 
-#include "resourcefiles/resourcefile.h"
+#include "resourcefile.h"
 #include "doomdata.h"
 #include "r_defs.h"
 #include "nodebuild.h"

src/playsim/bots/b_bot.cpp

@@ -47,7 +47,7 @@
 #include "d_net.h"
 #include "serializer.h"
 #include "d_player.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "vm.h"
 #include "g_levellocals.h"
 

src/playsim/fragglescript/t_func.cpp

@@ -40,7 +40,7 @@
 #include "c_console.h"
 #include "c_dispatch.h"
 #include "d_player.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "gi.h"
 #include "v_font.h"
 #include "serializer.h"

src/playsim/fragglescript/t_load.cpp

@@ -24,7 +24,7 @@
 //
 
 
-#include "w_wad.h"
+#include "filesystem.h"
 #include "g_level.h"
 #include "s_sound.h"
 #include "r_sky.h"

src/playsim/fragglescript/t_prepro.cpp

@@ -41,7 +41,7 @@
 /* includes ************************/
 
 #include "t_script.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "serializer.h"
 #include "g_levellocals.h"
 

src/playsim/p_3dfloors.cpp

@@ -39,7 +39,7 @@
 #include "p_local.h"
 #include "p_lnspec.h"
 #include "p_maputl.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "g_level.h"
 #include "p_terrain.h"
 #include "d_player.h"

src/playsim/p_acs.cpp

@@ -51,7 +51,7 @@
 #include "s_sndseq.h"
 #include "sbar.h"
 #include "a_sharedglobal.h"
-#include "w_wad.h"
+#include "filesystem.h"
 #include "r_sky.h"
 #include "gstrings.h"
 #include "gi.h"