From 05d8856fe021f0f563144f19e3d83cd4ef7486fc Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 13:36:23 +0200 Subject: [PATCH] - moved file system implementation to 'common'. --- src/CMakeLists.txt | 29 ++++++++++--------- src/am_map.cpp | 2 +- .../filesystem}/ancientzip.cpp | 0 .../filesystem}/ancientzip.h | 0 .../filesystem}/file_7z.cpp | 0 .../filesystem}/file_directory.cpp | 0 .../filesystem}/file_grp.cpp | 0 .../filesystem}/file_lump.cpp | 0 .../filesystem}/file_pak.cpp | 0 .../filesystem}/file_rff.cpp | 0 .../filesystem}/file_wad.cpp | 2 +- .../filesystem}/file_whres.cpp | 0 .../filesystem}/file_zip.cpp | 0 .../filesystem}/file_zip.h | 0 .../filesystem/filesystem.cpp} | 3 +- .../filesystem/filesystem.h} | 2 +- .../filesystem}/resourcefile.cpp | 0 .../filesystem}/resourcefile.h | 0 src/{gamedata => common/filesystem}/w_zip.h | 0 src/console/c_bind.cpp | 2 +- src/console/c_cmds.cpp | 2 +- src/console/c_console.cpp | 2 +- src/d_iwad.cpp | 2 +- src/d_main.cpp | 2 +- src/g_dumpinfo.cpp | 2 +- src/g_game.cpp | 2 +- src/g_level.cpp | 2 +- src/g_level.h | 2 +- src/g_statusbar/sbarinfo.cpp | 2 +- src/g_statusbar/shared_hud.cpp | 2 +- src/g_statusbar/shared_sbar.cpp | 2 +- src/gamedata/a_keys.cpp | 2 +- src/gamedata/d_dehacked.cpp | 2 +- src/gamedata/decallib.cpp | 2 +- src/gamedata/fonts/font.cpp | 2 +- src/gamedata/fonts/hexfont.cpp | 2 +- src/gamedata/fonts/singlelumpfont.cpp | 2 +- src/gamedata/fonts/singlepicfont.cpp | 2 +- src/gamedata/fonts/v_font.cpp | 2 +- src/gamedata/fonts/v_font.h | 2 +- src/gamedata/fonts/v_text.cpp | 2 +- src/gamedata/g_mapinfo.cpp | 2 +- src/gamedata/g_mapinfo.h | 2 +- src/gamedata/gi.cpp | 2 +- src/gamedata/info.cpp | 2 +- src/gamedata/keysections.cpp | 2 +- src/gamedata/p_terrain.cpp | 2 +- src/gamedata/statistics.cpp | 2 +- src/gamedata/stringtable.cpp | 2 +- src/gamedata/teaminfo.cpp | 2 +- src/gamedata/textures/anim_switches.cpp | 2 +- src/gamedata/textures/animations.cpp | 2 +- .../textures/formats/automaptexture.cpp | 2 +- .../textures/formats/brightmaptexture.cpp | 2 +- .../textures/formats/buildtexture.cpp | 4 +-- src/gamedata/textures/formats/ddstexture.cpp | 2 +- .../textures/formats/emptytexture.cpp | 2 +- src/gamedata/textures/formats/flattexture.cpp | 2 +- src/gamedata/textures/formats/fontchars.cpp | 2 +- src/gamedata/textures/formats/imgztexture.cpp | 2 +- src/gamedata/textures/formats/jpegtexture.cpp | 2 +- .../textures/formats/multipatchtexture.cpp | 2 +- .../textures/formats/patchtexture.cpp | 2 +- src/gamedata/textures/formats/pcxtexture.cpp | 2 +- src/gamedata/textures/formats/pngtexture.cpp | 2 +- .../textures/formats/rawpagetexture.cpp | 2 +- .../textures/formats/shadertexture.cpp | 2 +- src/gamedata/textures/formats/stbtexture.cpp | 2 +- src/gamedata/textures/formats/tgatexture.cpp | 2 +- src/gamedata/textures/image.cpp | 2 +- src/gamedata/textures/imagetexture.cpp | 2 +- .../textures/multipatchtexturebuilder.cpp | 2 +- src/gamedata/textures/skyboxtexture.cpp | 2 +- src/gamedata/textures/texture.cpp | 2 +- src/gamedata/textures/texturemanager.cpp | 2 +- src/gamedata/umapinfo.cpp | 2 +- src/gamedata/xlat/parsecontext.cpp | 2 +- src/intermission/intermission.cpp | 2 +- src/intermission/intermission_parse.cpp | 2 +- src/m_misc.cpp | 2 +- src/maploader/compatibility.cpp | 2 +- src/maploader/edata.cpp | 2 +- src/maploader/glnodes.cpp | 2 +- src/maploader/maploader.cpp | 2 +- src/maploader/postprocessor.cpp | 2 +- src/maploader/strifedialogue.cpp | 2 +- src/maploader/udmf.cpp | 2 +- src/maploader/usdf.cpp | 2 +- src/menu/loadsavemenu.cpp | 2 +- src/menu/menudef.cpp | 2 +- src/p_conversation.cpp | 2 +- src/p_openmap.cpp | 2 +- src/p_setup.cpp | 2 +- src/p_setup.h | 2 +- src/playsim/bots/b_bot.cpp | 2 +- src/playsim/fragglescript/t_func.cpp | 2 +- src/playsim/fragglescript/t_load.cpp | 2 +- src/playsim/fragglescript/t_prepro.cpp | 2 +- src/playsim/p_3dfloors.cpp | 2 +- src/playsim/p_acs.cpp | 2 +- src/playsim/p_user.cpp | 2 +- src/posix/sdl/i_main.cpp | 2 +- src/r_data/colormaps.cpp | 2 +- src/r_data/gldefs.cpp | 2 +- src/r_data/models/models.cpp | 2 +- src/r_data/models/models_md2.cpp | 2 +- src/r_data/models/models_md3.cpp | 2 +- src/r_data/models/models_obj.cpp | 2 +- src/r_data/models/models_ue1.cpp | 2 +- src/r_data/models/models_voxel.cpp | 2 +- src/r_data/r_translate.cpp | 2 +- src/r_data/r_vanillatrans.cpp | 2 +- src/r_data/sprites.cpp | 2 +- src/r_data/v_palette.cpp | 2 +- src/r_data/voxels.cpp | 2 +- src/rendering/2d/v_drawtext.cpp | 2 +- src/rendering/gl/renderer/gl_renderer.cpp | 2 +- src/rendering/gl/shaders/gl_shader.cpp | 2 +- src/rendering/gl/shaders/gl_shaderprogram.cpp | 2 +- src/rendering/hwrenderer/models/hw_models.cpp | 2 +- src/rendering/hwrenderer/scene/hw_skydome.cpp | 2 +- .../hwrenderer/scene/hw_skyportal.cpp | 2 +- .../hwrenderer/textures/hw_material.cpp | 2 +- .../hwrenderer/textures/hw_precache.cpp | 2 +- .../polyrenderer/drawers/poly_thread.cpp | 2 +- .../polyrenderer/drawers/poly_triangle.cpp | 2 +- .../polyrenderer/drawers/screen_triangle.cpp | 2 +- src/rendering/swrenderer/drawers/r_draw.cpp | 2 +- .../swrenderer/drawers/r_draw_rgba.cpp | 2 +- src/rendering/swrenderer/drawers/r_thread.cpp | 2 +- .../swrenderer/line/r_farclip_line.cpp | 2 +- .../swrenderer/line/r_fogboundary.cpp | 2 +- src/rendering/swrenderer/line/r_line.cpp | 2 +- src/rendering/swrenderer/line/r_wallsetup.cpp | 2 +- .../swrenderer/plane/r_flatplane.cpp | 2 +- .../swrenderer/plane/r_planerenderer.cpp | 2 +- src/rendering/swrenderer/plane/r_skyplane.cpp | 2 +- .../swrenderer/plane/r_slopeplane.cpp | 2 +- .../swrenderer/plane/r_visibleplane.cpp | 2 +- .../swrenderer/plane/r_visibleplanelist.cpp | 2 +- src/rendering/swrenderer/r_swcolormaps.cpp | 2 +- src/rendering/swrenderer/r_swscene.cpp | 2 +- src/rendering/swrenderer/scene/r_light.cpp | 2 +- src/rendering/swrenderer/scene/r_scene.cpp | 2 +- .../swrenderer/scene/r_translucent_pass.cpp | 2 +- src/rendering/swrenderer/things/r_decal.cpp | 2 +- .../swrenderer/things/r_particle.cpp | 2 +- .../swrenderer/things/r_playersprite.cpp | 2 +- src/rendering/swrenderer/things/r_sprite.cpp | 2 +- .../swrenderer/things/r_visiblesprite.cpp | 2 +- .../swrenderer/things/r_visiblespritelist.cpp | 2 +- .../swrenderer/things/r_wallsprite.cpp | 2 +- .../swrenderer/viewport/r_viewport.cpp | 2 +- src/rendering/v_video.cpp | 2 +- .../vulkan/renderer/vk_postprocess.cpp | 2 +- src/rendering/vulkan/shaders/vk_shader.cpp | 2 +- src/scripting/backend/codegen.cpp | 2 +- src/scripting/decorate/thingdef_parse.cpp | 2 +- src/scripting/thingdef_properties.cpp | 2 +- src/scripting/zscript/zcc_compile.cpp | 2 +- src/scripting/zscript/zcc_parser.cpp | 2 +- src/serializer.cpp | 2 +- src/serializer.h | 2 +- src/sound/music/i_music.cpp | 2 +- src/sound/music/i_soundfont.cpp | 2 +- src/sound/music/i_soundfont.h | 2 +- src/sound/s_advsound.cpp | 2 +- src/sound/s_doomsound.cpp | 2 +- src/sound/s_music.cpp | 2 +- src/sound/s_reverbedit.cpp | 2 +- src/sound/s_sndseq.cpp | 2 +- src/utility/sc_man.cpp | 2 +- src/utility/v_collection.cpp | 2 +- src/wi_stuff.cpp | 2 +- src/win32/i_main.cpp | 2 +- src/win32/st_start.cpp | 2 +- src/win32/st_start_util.cpp | 2 +- 177 files changed, 179 insertions(+), 177 deletions(-) rename src/{gamedata/resourcefiles => common/filesystem}/ancientzip.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/ancientzip.h (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_7z.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_directory.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_grp.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_lump.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_pak.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_rff.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_wad.cpp (99%) rename src/{gamedata/resourcefiles => common/filesystem}/file_whres.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_zip.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/file_zip.h (100%) rename src/{gamedata/w_wad.cpp => common/filesystem/filesystem.cpp} (99%) rename src/{gamedata/w_wad.h => common/filesystem/filesystem.h} (99%) rename src/{gamedata/resourcefiles => common/filesystem}/resourcefile.cpp (100%) rename src/{gamedata/resourcefiles => common/filesystem}/resourcefile.h (100%) rename src/{gamedata => common/filesystem}/w_zip.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9122fe0e46..a46890fac5 100644 --- a/src/CMakeLists.txt +++ b/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/.+") diff --git a/src/am_map.cpp b/src/am_map.cpp index fbd1d2bac0..a72adbd617 100644 --- a/src/am_map.cpp +++ b/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" diff --git a/src/gamedata/resourcefiles/ancientzip.cpp b/src/common/filesystem/ancientzip.cpp similarity index 100% rename from src/gamedata/resourcefiles/ancientzip.cpp rename to src/common/filesystem/ancientzip.cpp diff --git a/src/gamedata/resourcefiles/ancientzip.h b/src/common/filesystem/ancientzip.h similarity index 100% rename from src/gamedata/resourcefiles/ancientzip.h rename to src/common/filesystem/ancientzip.h diff --git a/src/gamedata/resourcefiles/file_7z.cpp b/src/common/filesystem/file_7z.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_7z.cpp rename to src/common/filesystem/file_7z.cpp diff --git a/src/gamedata/resourcefiles/file_directory.cpp b/src/common/filesystem/file_directory.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_directory.cpp rename to src/common/filesystem/file_directory.cpp diff --git a/src/gamedata/resourcefiles/file_grp.cpp b/src/common/filesystem/file_grp.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_grp.cpp rename to src/common/filesystem/file_grp.cpp diff --git a/src/gamedata/resourcefiles/file_lump.cpp b/src/common/filesystem/file_lump.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_lump.cpp rename to src/common/filesystem/file_lump.cpp diff --git a/src/gamedata/resourcefiles/file_pak.cpp b/src/common/filesystem/file_pak.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_pak.cpp rename to src/common/filesystem/file_pak.cpp diff --git a/src/gamedata/resourcefiles/file_rff.cpp b/src/common/filesystem/file_rff.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_rff.cpp rename to src/common/filesystem/file_rff.cpp diff --git a/src/gamedata/resourcefiles/file_wad.cpp b/src/common/filesystem/file_wad.cpp similarity index 99% rename from src/gamedata/resourcefiles/file_wad.cpp rename to src/common/filesystem/file_wad.cpp index e4caa50b5c..2cbb4a3dcc 100644 --- a/src/gamedata/resourcefiles/file_wad.cpp +++ b/src/common/filesystem/file_wad.cpp @@ -36,7 +36,7 @@ #include #include "resourcefile.h" #include "v_text.h" -#include "w_wad.h" +#include "filesystem.h" #include "engineerrors.h" diff --git a/src/gamedata/resourcefiles/file_whres.cpp b/src/common/filesystem/file_whres.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_whres.cpp rename to src/common/filesystem/file_whres.cpp diff --git a/src/gamedata/resourcefiles/file_zip.cpp b/src/common/filesystem/file_zip.cpp similarity index 100% rename from src/gamedata/resourcefiles/file_zip.cpp rename to src/common/filesystem/file_zip.cpp diff --git a/src/gamedata/resourcefiles/file_zip.h b/src/common/filesystem/file_zip.h similarity index 100% rename from src/gamedata/resourcefiles/file_zip.h rename to src/common/filesystem/file_zip.h diff --git a/src/gamedata/w_wad.cpp b/src/common/filesystem/filesystem.cpp similarity index 99% rename from src/gamedata/w_wad.cpp rename to src/common/filesystem/filesystem.cpp index 3bd664aca0..c7620e28d3 100644 --- a/src/gamedata/w_wad.cpp +++ b/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; diff --git a/src/gamedata/w_wad.h b/src/common/filesystem/filesystem.h similarity index 99% rename from src/gamedata/w_wad.h rename to src/common/filesystem/filesystem.h index be8b56cdcc..be22ab028e 100644 --- a/src/gamedata/w_wad.h +++ b/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; diff --git a/src/gamedata/resourcefiles/resourcefile.cpp b/src/common/filesystem/resourcefile.cpp similarity index 100% rename from src/gamedata/resourcefiles/resourcefile.cpp rename to src/common/filesystem/resourcefile.cpp diff --git a/src/gamedata/resourcefiles/resourcefile.h b/src/common/filesystem/resourcefile.h similarity index 100% rename from src/gamedata/resourcefiles/resourcefile.h rename to src/common/filesystem/resourcefile.h diff --git a/src/gamedata/w_zip.h b/src/common/filesystem/w_zip.h similarity index 100% rename from src/gamedata/w_zip.h rename to src/common/filesystem/w_zip.h diff --git a/src/console/c_bind.cpp b/src/console/c_bind.cpp index b78023af8c..d88dd3be2f 100644 --- a/src/console/c_bind.cpp +++ b/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" diff --git a/src/console/c_cmds.cpp b/src/console/c_cmds.cpp index e62bfa39eb..9272be308d 100644 --- a/src/console/c_cmds.cpp +++ b/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" diff --git a/src/console/c_console.cpp b/src/console/c_console.cpp index 14bba8d6a8..bf5da1723f 100644 --- a/src/console/c_console.cpp +++ b/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" diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index c5336e7180..1531c52619 100644 --- a/src/d_iwad.cpp +++ b/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" diff --git a/src/d_main.cpp b/src/d_main.cpp index c408897163..df2c076852 100644 --- a/src/d_main.cpp +++ b/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" diff --git a/src/g_dumpinfo.cpp b/src/g_dumpinfo.cpp index b17219c947..7c82682dd9 100644 --- a/src/g_dumpinfo.cpp +++ b/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" diff --git a/src/g_game.cpp b/src/g_game.cpp index b53e496071..b9d014e075 100644 --- a/src/g_game.cpp +++ b/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" diff --git a/src/g_level.cpp b/src/g_level.cpp index 7a462dbfdc..d75d3c3ec2 100644 --- a/src/g_level.cpp +++ b/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" diff --git a/src/g_level.h b/src/g_level.h index 5a8ca237c2..620622e4d4 100644 --- a/src/g_level.h +++ b/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" diff --git a/src/g_statusbar/sbarinfo.cpp b/src/g_statusbar/sbarinfo.cpp index 36ee0566ad..3f2de463fc 100644 --- a/src/g_statusbar/sbarinfo.cpp +++ b/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" diff --git a/src/g_statusbar/shared_hud.cpp b/src/g_statusbar/shared_hud.cpp index 2a3e467f52..1e230a75e5 100644 --- a/src/g_statusbar/shared_hud.cpp +++ b/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" diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index 15a24a5c2f..cc20fe0260 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/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" diff --git a/src/gamedata/a_keys.cpp b/src/gamedata/a_keys.cpp index 924f726752..24c9211ecf 100644 --- a/src/gamedata/a_keys.cpp +++ b/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" diff --git a/src/gamedata/d_dehacked.cpp b/src/gamedata/d_dehacked.cpp index 6694896607..b4d076b157 100644 --- a/src/gamedata/d_dehacked.cpp +++ b/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" diff --git a/src/gamedata/decallib.cpp b/src/gamedata/decallib.cpp index 9213938971..3c5bb9f0df 100644 --- a/src/gamedata/decallib.cpp +++ b/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" diff --git a/src/gamedata/fonts/font.cpp b/src/gamedata/fonts/font.cpp index 8afdc928e5..914fdeddba 100644 --- a/src/gamedata/fonts/font.cpp +++ b/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" diff --git a/src/gamedata/fonts/hexfont.cpp b/src/gamedata/fonts/hexfont.cpp index 2b04fface3..f2462444c1 100644 --- a/src/gamedata/fonts/hexfont.cpp +++ b/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" diff --git a/src/gamedata/fonts/singlelumpfont.cpp b/src/gamedata/fonts/singlelumpfont.cpp index ceeb705d9f..f1aafd10d4 100644 --- a/src/gamedata/fonts/singlelumpfont.cpp +++ b/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" diff --git a/src/gamedata/fonts/singlepicfont.cpp b/src/gamedata/fonts/singlepicfont.cpp index 34362b728a..a42aafe798 100644 --- a/src/gamedata/fonts/singlepicfont.cpp +++ b/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 { diff --git a/src/gamedata/fonts/v_font.cpp b/src/gamedata/fonts/v_font.cpp index ab6574ad3c..f16a11e791 100644 --- a/src/gamedata/fonts/v_font.cpp +++ b/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" diff --git a/src/gamedata/fonts/v_font.h b/src/gamedata/fonts/v_font.h index e97a5ebc49..841add6d76 100644 --- a/src/gamedata/fonts/v_font.h +++ b/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; diff --git a/src/gamedata/fonts/v_text.cpp b/src/gamedata/fonts/v_text.cpp index fbbbde9e1e..437e564500 100644 --- a/src/gamedata/fonts/v_text.cpp +++ b/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" diff --git a/src/gamedata/g_mapinfo.cpp b/src/gamedata/g_mapinfo.cpp index bedbf1cc3a..267a2f3cb8 100644 --- a/src/gamedata/g_mapinfo.cpp +++ b/src/gamedata/g_mapinfo.cpp @@ -36,7 +36,7 @@ #include #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" diff --git a/src/gamedata/g_mapinfo.h b/src/gamedata/g_mapinfo.h index 6e287fadce..79953e88ae 100644 --- a/src/gamedata/g_mapinfo.h +++ b/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; diff --git a/src/gamedata/gi.cpp b/src/gamedata/gi.cpp index e27b73745b..a09035f5ae 100644 --- a/src/gamedata/gi.cpp +++ b/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" diff --git a/src/gamedata/info.cpp b/src/gamedata/info.cpp index 689cd662f7..3c98f81916 100644 --- a/src/gamedata/info.cpp +++ b/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 (); diff --git a/src/gamedata/keysections.cpp b/src/gamedata/keysections.cpp index c15a670172..464941d2ec 100644 --- a/src/gamedata/keysections.cpp +++ b/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 KeySections; extern TArray KeyConfWeapons; diff --git a/src/gamedata/p_terrain.cpp b/src/gamedata/p_terrain.cpp index 75ce3dfed8..3b71db0f2f 100644 --- a/src/gamedata/p_terrain.cpp +++ b/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" diff --git a/src/gamedata/statistics.cpp b/src/gamedata/statistics.cpp index 756f9380da..21193856d2 100644 --- a/src/gamedata/statistics.cpp +++ b/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" diff --git a/src/gamedata/stringtable.cpp b/src/gamedata/stringtable.cpp index ce777f2b3d..3c0a256ca8 100644 --- a/src/gamedata/stringtable.cpp +++ b/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" diff --git a/src/gamedata/teaminfo.cpp b/src/gamedata/teaminfo.cpp index 243b5018fa..bd836ab08d 100644 --- a/src/gamedata/teaminfo.cpp +++ b/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 ------------------------------------------------------------------ diff --git a/src/gamedata/textures/anim_switches.cpp b/src/gamedata/textures/anim_switches.cpp index 1adcfd1deb..9856e8b495 100644 --- a/src/gamedata/textures/anim_switches.cpp +++ b/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" diff --git a/src/gamedata/textures/animations.cpp b/src/gamedata/textures/animations.cpp index 5a8b5a9603..bb7e3b066f 100644 --- a/src/gamedata/textures/animations.cpp +++ b/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 ------------------------------------------------------------------ diff --git a/src/gamedata/textures/formats/automaptexture.cpp b/src/gamedata/textures/formats/automaptexture.cpp index f6c5e0101d..87200daf48 100644 --- a/src/gamedata/textures/formats/automaptexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/brightmaptexture.cpp b/src/gamedata/textures/formats/brightmaptexture.cpp index b9baf23839..a5ed6477a1 100644 --- a/src/gamedata/textures/formats/brightmaptexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/buildtexture.cpp b/src/gamedata/textures/formats/buildtexture.cpp index 97dbb1b1f9..d1e505640c 100644 --- a/src/gamedata/textures/formats/buildtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/ddstexture.cpp b/src/gamedata/textures/formats/ddstexture.cpp index 8120486521..6d86ffcb43 100644 --- a/src/gamedata/textures/formats/ddstexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/emptytexture.cpp b/src/gamedata/textures/formats/emptytexture.cpp index 1073de660c..91f22f1a0c 100644 --- a/src/gamedata/textures/formats/emptytexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/flattexture.cpp b/src/gamedata/textures/formats/flattexture.cpp index 792753fea4..98321bbd0f 100644 --- a/src/gamedata/textures/formats/flattexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/fontchars.cpp b/src/gamedata/textures/formats/fontchars.cpp index c01d4195ee..6d54f04120 100644 --- a/src/gamedata/textures/formats/fontchars.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/imgztexture.cpp b/src/gamedata/textures/formats/imgztexture.cpp index 08160cf9ca..bcd9b5ac4a 100644 --- a/src/gamedata/textures/formats/imgztexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/jpegtexture.cpp b/src/gamedata/textures/formats/jpegtexture.cpp index 3234889f50..5ddcd9ef8f 100644 --- a/src/gamedata/textures/formats/jpegtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/multipatchtexture.cpp b/src/gamedata/textures/formats/multipatchtexture.cpp index e858e61c77..3dd3748207 100644 --- a/src/gamedata/textures/formats/multipatchtexture.cpp +++ b/src/gamedata/textures/formats/multipatchtexture.cpp @@ -36,7 +36,7 @@ #include #include "doomtype.h" #include "files.h" -#include "w_wad.h" +#include "filesystem.h" #include "gi.h" #include "st_start.h" diff --git a/src/gamedata/textures/formats/patchtexture.cpp b/src/gamedata/textures/formats/patchtexture.cpp index 9ca4228ebd..7cbb3a3ebc 100644 --- a/src/gamedata/textures/formats/patchtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/pcxtexture.cpp b/src/gamedata/textures/formats/pcxtexture.cpp index 9489e1123a..b2b571d213 100644 --- a/src/gamedata/textures/formats/pcxtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/pngtexture.cpp b/src/gamedata/textures/formats/pngtexture.cpp index 1a70885e63..1bde18ad0b 100644 --- a/src/gamedata/textures/formats/pngtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/rawpagetexture.cpp b/src/gamedata/textures/formats/rawpagetexture.cpp index 5650fdde2c..e278c3a99f 100644 --- a/src/gamedata/textures/formats/rawpagetexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/shadertexture.cpp b/src/gamedata/textures/formats/shadertexture.cpp index cbeaa9f730..a9d3fd109d 100644 --- a/src/gamedata/textures/formats/shadertexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/stbtexture.cpp b/src/gamedata/textures/formats/stbtexture.cpp index 2beaf12258..1a1c2090d4 100644 --- a/src/gamedata/textures/formats/stbtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/formats/tgatexture.cpp b/src/gamedata/textures/formats/tgatexture.cpp index 065f107c30..f23020f24b 100644 --- a/src/gamedata/textures/formats/tgatexture.cpp +++ b/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" diff --git a/src/gamedata/textures/image.cpp b/src/gamedata/textures/image.cpp index a0a9274c8d..8c26a410ca 100644 --- a/src/gamedata/textures/image.cpp +++ b/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" diff --git a/src/gamedata/textures/imagetexture.cpp b/src/gamedata/textures/imagetexture.cpp index 6b538499a5..91711f3c37 100644 --- a/src/gamedata/textures/imagetexture.cpp +++ b/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" diff --git a/src/gamedata/textures/multipatchtexturebuilder.cpp b/src/gamedata/textures/multipatchtexturebuilder.cpp index ad345bcf65..da71656c82 100644 --- a/src/gamedata/textures/multipatchtexturebuilder.cpp +++ b/src/gamedata/textures/multipatchtexturebuilder.cpp @@ -37,7 +37,7 @@ #include #include "doomtype.h" #include "files.h" -#include "w_wad.h" +#include "filesystem.h" #include "gi.h" #include "st_start.h" diff --git a/src/gamedata/textures/skyboxtexture.cpp b/src/gamedata/textures/skyboxtexture.cpp index 45e79bf74d..9312c23030 100644 --- a/src/gamedata/textures/skyboxtexture.cpp +++ b/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" diff --git a/src/gamedata/textures/texture.cpp b/src/gamedata/textures/texture.cpp index 3b639e3773..1f37223b99 100644 --- a/src/gamedata/textures/texture.cpp +++ b/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" diff --git a/src/gamedata/textures/texturemanager.cpp b/src/gamedata/textures/texturemanager.cpp index 1c21bcb52c..46bd85137e 100644 --- a/src/gamedata/textures/texturemanager.cpp +++ b/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" diff --git a/src/gamedata/umapinfo.cpp b/src/gamedata/umapinfo.cpp index ce8d9cafe9..0413a0abef 100644 --- a/src/gamedata/umapinfo.cpp +++ b/src/gamedata/umapinfo.cpp @@ -19,7 +19,7 @@ #include #include -#include "w_wad.h" +#include "filesystem.h" #include "g_level.h" #include "r_defs.h" #include "p_setup.h" diff --git a/src/gamedata/xlat/parsecontext.cpp b/src/gamedata/xlat/parsecontext.cpp index 4f2ff0a9a0..cac663cfc3 100644 --- a/src/gamedata/xlat/parsecontext.cpp +++ b/src/gamedata/xlat/parsecontext.cpp @@ -35,7 +35,7 @@ #include #include -#include "w_wad.h" +#include "filesystem.h" #include "parsecontext.h" #include "p_lnspec.h" diff --git a/src/intermission/intermission.cpp b/src/intermission/intermission.cpp index 2012d9c342..5393b93812 100644 --- a/src/intermission/intermission.cpp +++ b/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" diff --git a/src/intermission/intermission_parse.cpp b/src/intermission/intermission_parse.cpp index b2c9949d2f..cabd269a95 100644 --- a/src/intermission/intermission_parse.cpp +++ b/src/intermission/intermission_parse.cpp @@ -37,7 +37,7 @@ #include #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" diff --git a/src/m_misc.cpp b/src/m_misc.cpp index 0f3fe90724..40474c69e2 100644 --- a/src/m_misc.cpp +++ b/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" diff --git a/src/maploader/compatibility.cpp b/src/maploader/compatibility.cpp index f393ea888e..2ceaa85cd7 100644 --- a/src/maploader/compatibility.cpp +++ b/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" diff --git a/src/maploader/edata.cpp b/src/maploader/edata.cpp index cd311e9cfd..9d50b26b40 100644 --- a/src/maploader/edata.cpp +++ b/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" diff --git a/src/maploader/glnodes.cpp b/src/maploader/glnodes.cpp index 0feb9918f5..216fb5784c 100644 --- a/src/maploader/glnodes.cpp +++ b/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" diff --git a/src/maploader/maploader.cpp b/src/maploader/maploader.cpp index ab87de9160..5255f1ff88 100644 --- a/src/maploader/maploader.cpp +++ b/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" diff --git a/src/maploader/postprocessor.cpp b/src/maploader/postprocessor.cpp index c2d6051075..d47b2df8ee 100644 --- a/src/maploader/postprocessor.cpp +++ b/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" diff --git a/src/maploader/strifedialogue.cpp b/src/maploader/strifedialogue.cpp index 9f2681cc78..748c3dc7f4 100644 --- a/src/maploader/strifedialogue.cpp +++ b/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" diff --git a/src/maploader/udmf.cpp b/src/maploader/udmf.cpp index 72fa217287..1ba5a2b14c 100644 --- a/src/maploader/udmf.cpp +++ b/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" diff --git a/src/maploader/usdf.cpp b/src/maploader/usdf.cpp index 64aa792321..2bca2c3e98 100644 --- a/src/maploader/usdf.cpp +++ b/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" diff --git a/src/menu/loadsavemenu.cpp b/src/menu/loadsavemenu.cpp index c8c6cee7c2..71d7b86557 100644 --- a/src/menu/loadsavemenu.cpp +++ b/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" diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp index 0585810356..f68c73d494 100644 --- a/src/menu/menudef.cpp +++ b/src/menu/menudef.cpp @@ -34,7 +34,7 @@ #include #include "menu/menu.h" -#include "w_wad.h" +#include "filesystem.h" #include "c_bind.h" #include "i_music.h" #include "gi.h" diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp index 4ae7352bda..390c1de4ad 100644 --- a/src/p_conversation.cpp +++ b/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" diff --git a/src/p_openmap.cpp b/src/p_openmap.cpp index 846ee2b99e..98f03906a1 100644 --- a/src/p_openmap.cpp +++ b/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" diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 53a2e4bb70..05f31ea233 100644 --- a/src/p_setup.cpp +++ b/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" diff --git a/src/p_setup.h b/src/p_setup.h index 55c7dfdcda..e6bef780d0 100644 --- a/src/p_setup.h +++ b/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" diff --git a/src/playsim/bots/b_bot.cpp b/src/playsim/bots/b_bot.cpp index 6d5209a32e..0bdd0cc1e0 100644 --- a/src/playsim/bots/b_bot.cpp +++ b/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" diff --git a/src/playsim/fragglescript/t_func.cpp b/src/playsim/fragglescript/t_func.cpp index db5930ed04..6b58177e0e 100644 --- a/src/playsim/fragglescript/t_func.cpp +++ b/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" diff --git a/src/playsim/fragglescript/t_load.cpp b/src/playsim/fragglescript/t_load.cpp index 5b6915e858..96df4dc499 100644 --- a/src/playsim/fragglescript/t_load.cpp +++ b/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" diff --git a/src/playsim/fragglescript/t_prepro.cpp b/src/playsim/fragglescript/t_prepro.cpp index 9bd78fcee5..69e1c4ab14 100644 --- a/src/playsim/fragglescript/t_prepro.cpp +++ b/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" diff --git a/src/playsim/p_3dfloors.cpp b/src/playsim/p_3dfloors.cpp index 4f8a5d961f..7d7c60889d 100644 --- a/src/playsim/p_3dfloors.cpp +++ b/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" diff --git a/src/playsim/p_acs.cpp b/src/playsim/p_acs.cpp index 1930082daa..6f4ea57d47 100644 --- a/src/playsim/p_acs.cpp +++ b/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" diff --git a/src/playsim/p_user.cpp b/src/playsim/p_user.cpp index e5f8fb9dba..df8ab96de4 100644 --- a/src/playsim/p_user.cpp +++ b/src/playsim/p_user.cpp @@ -70,7 +70,7 @@ #include "p_enemy.h" #include "a_sharedglobal.h" #include "a_keys.h" -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "sbar.h" #include "intermission/intermission.h" diff --git a/src/posix/sdl/i_main.cpp b/src/posix/sdl/i_main.cpp index bac53e3131..ed0e264505 100644 --- a/src/posix/sdl/i_main.cpp +++ b/src/posix/sdl/i_main.cpp @@ -46,7 +46,7 @@ #include "d_main.h" #include "c_console.h" #include "version.h" -#include "w_wad.h" +#include "filesystem.h" #include "g_level.h" #include "g_levellocals.h" #include "cmdlib.h" diff --git a/src/r_data/colormaps.cpp b/src/r_data/colormaps.cpp index b121efbd70..65f1b8e32e 100644 --- a/src/r_data/colormaps.cpp +++ b/src/r_data/colormaps.cpp @@ -39,7 +39,7 @@ #include -#include "w_wad.h" +#include "filesystem.h" #include "r_sky.h" #include "colormaps.h" #include "templates.h" diff --git a/src/r_data/gldefs.cpp b/src/r_data/gldefs.cpp index 20b06a109b..9a4ce48bb4 100644 --- a/src/r_data/gldefs.cpp +++ b/src/r_data/gldefs.cpp @@ -36,7 +36,7 @@ #include "sc_man.h" #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "gi.h" #include "r_state.h" #include "stats.h" diff --git a/src/r_data/models/models.cpp b/src/r_data/models/models.cpp index c2c34f429e..0b0dabbce7 100644 --- a/src/r_data/models/models.cpp +++ b/src/r_data/models/models.cpp @@ -26,7 +26,7 @@ ** **/ -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "sc_man.h" #include "m_crc32.h" diff --git a/src/r_data/models/models_md2.cpp b/src/r_data/models/models_md2.cpp index 15651c8e58..42a3288f17 100644 --- a/src/r_data/models/models_md2.cpp +++ b/src/r_data/models/models_md2.cpp @@ -26,7 +26,7 @@ ** **/ -#include "w_wad.h" +#include "filesystem.h" #include "r_data/models/models.h" #ifdef _MSC_VER diff --git a/src/r_data/models/models_md3.cpp b/src/r_data/models/models_md3.cpp index edb6c7a7c5..23c603a9f6 100644 --- a/src/r_data/models/models_md3.cpp +++ b/src/r_data/models/models_md3.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "r_data/models/models.h" diff --git a/src/r_data/models/models_obj.cpp b/src/r_data/models/models_obj.cpp index 9a7c6f3356..5ad5c9e11d 100644 --- a/src/r_data/models/models_obj.cpp +++ b/src/r_data/models/models_obj.cpp @@ -19,7 +19,7 @@ // //-------------------------------------------------------------------------- -#include "w_wad.h" +#include "filesystem.h" #include "r_data/models/models_obj.h" /** diff --git a/src/r_data/models/models_ue1.cpp b/src/r_data/models/models_ue1.cpp index 52b9d11e0a..007bd0f4a1 100644 --- a/src/r_data/models/models_ue1.cpp +++ b/src/r_data/models/models_ue1.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "r_data/models/models_ue1.h" diff --git a/src/r_data/models/models_voxel.cpp b/src/r_data/models/models_voxel.cpp index b0acb941c2..bc52646b65 100644 --- a/src/r_data/models/models_voxel.cpp +++ b/src/r_data/models/models_voxel.cpp @@ -26,7 +26,7 @@ ** **/ -#include "w_wad.h" +#include "filesystem.h" #include "g_level.h" #include "colormatcher.h" #include "textures/bitmap.h" diff --git a/src/r_data/r_translate.cpp b/src/r_data/r_translate.cpp index abbf857930..21ea1130f0 100644 --- a/src/r_data/r_translate.cpp +++ b/src/r_data/r_translate.cpp @@ -41,7 +41,7 @@ #include "d_netinf.h" #include "sc_man.h" #include "engineerrors.h" -#include "w_wad.h" +#include "filesystem.h" #include "serializer.h" #include "d_player.h" #include "r_data/sprites.h" diff --git a/src/r_data/r_vanillatrans.cpp b/src/r_data/r_vanillatrans.cpp index d7b61772cb..e969dd3d89 100644 --- a/src/r_data/r_vanillatrans.cpp +++ b/src/r_data/r_vanillatrans.cpp @@ -38,7 +38,7 @@ #include "templates.h" #include "c_cvars.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomtype.h" #ifdef _DEBUG #include "c_dispatch.h" diff --git a/src/r_data/sprites.cpp b/src/r_data/sprites.cpp index a6dca0f2d0..712ad96519 100644 --- a/src/r_data/sprites.cpp +++ b/src/r_data/sprites.cpp @@ -22,7 +22,7 @@ #include "doomtype.h" -#include "w_wad.h" +#include "filesystem.h" #include "s_sound.h" #include "d_player.h" diff --git a/src/r_data/v_palette.cpp b/src/r_data/v_palette.cpp index 43dfccfa49..ac93981b72 100644 --- a/src/r_data/v_palette.cpp +++ b/src/r_data/v_palette.cpp @@ -42,7 +42,7 @@ #include "templates.h" #include "v_video.h" -#include "w_wad.h" +#include "filesystem.h" #include "i_video.h" #include "c_dispatch.h" #include "st_stuff.h" diff --git a/src/r_data/voxels.cpp b/src/r_data/voxels.cpp index c51b6fd7f5..71666918ef 100644 --- a/src/r_data/voxels.cpp +++ b/src/r_data/voxels.cpp @@ -39,7 +39,7 @@ #include "m_swap.h" #include "m_argv.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "sc_man.h" #include "s_sound.h" diff --git a/src/rendering/2d/v_drawtext.cpp b/src/rendering/2d/v_drawtext.cpp index 4dff23df3b..8857e9d7f2 100644 --- a/src/rendering/2d/v_drawtext.cpp +++ b/src/rendering/2d/v_drawtext.cpp @@ -42,7 +42,7 @@ #include "v_video.h" -#include "w_wad.h" +#include "filesystem.h" #include "image.h" #include "textures/formats/multipatchtexture.h" diff --git a/src/rendering/gl/renderer/gl_renderer.cpp b/src/rendering/gl/renderer/gl_renderer.cpp index 6b722ad711..7b66b43b35 100644 --- a/src/rendering/gl/renderer/gl_renderer.cpp +++ b/src/rendering/gl/renderer/gl_renderer.cpp @@ -29,7 +29,7 @@ #include "files.h" #include "v_video.h" #include "m_png.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomstat.h" #include "i_time.h" #include "p_effect.h" diff --git a/src/rendering/gl/shaders/gl_shader.cpp b/src/rendering/gl/shaders/gl_shader.cpp index 47afc4c8dc..e6b141e862 100644 --- a/src/rendering/gl/shaders/gl_shader.cpp +++ b/src/rendering/gl/shaders/gl_shader.cpp @@ -29,7 +29,7 @@ #include "gl_load/gl_system.h" #include "c_cvars.h" #include "v_video.h" -#include "w_wad.h" +#include "filesystem.h" #include "engineerrors.h" #include "cmdlib.h" #include "md5.h" diff --git a/src/rendering/gl/shaders/gl_shaderprogram.cpp b/src/rendering/gl/shaders/gl_shaderprogram.cpp index 6c92338b0d..97fd8caeca 100644 --- a/src/rendering/gl/shaders/gl_shaderprogram.cpp +++ b/src/rendering/gl/shaders/gl_shaderprogram.cpp @@ -32,7 +32,7 @@ #include "gl/system/gl_debug.h" #include "gl/shaders/gl_shaderprogram.h" #include "hwrenderer/utility/hw_shaderpatcher.h" -#include "w_wad.h" +#include "filesystem.h" namespace OpenGLRenderer { diff --git a/src/rendering/hwrenderer/models/hw_models.cpp b/src/rendering/hwrenderer/models/hw_models.cpp index e3353d01a4..8a49cf99c3 100644 --- a/src/rendering/hwrenderer/models/hw_models.cpp +++ b/src/rendering/hwrenderer/models/hw_models.cpp @@ -26,7 +26,7 @@ ** **/ -#include "w_wad.h" +#include "filesystem.h" #include "g_game.h" #include "doomstat.h" #include "g_level.h" diff --git a/src/rendering/hwrenderer/scene/hw_skydome.cpp b/src/rendering/hwrenderer/scene/hw_skydome.cpp index 262ded1ed1..4c0e622814 100644 --- a/src/rendering/hwrenderer/scene/hw_skydome.cpp +++ b/src/rendering/hwrenderer/scene/hw_skydome.cpp @@ -55,7 +55,7 @@ */ #include "doomtype.h" #include "g_level.h" -#include "w_wad.h" +#include "filesystem.h" #include "r_state.h" #include "r_utility.h" #include "g_levellocals.h" diff --git a/src/rendering/hwrenderer/scene/hw_skyportal.cpp b/src/rendering/hwrenderer/scene/hw_skyportal.cpp index bba4b60eea..31f13825cd 100644 --- a/src/rendering/hwrenderer/scene/hw_skyportal.cpp +++ b/src/rendering/hwrenderer/scene/hw_skyportal.cpp @@ -22,7 +22,7 @@ #include "doomtype.h" #include "g_level.h" -#include "w_wad.h" +#include "filesystem.h" #include "r_state.h" #include "r_utility.h" #include "g_levellocals.h" diff --git a/src/rendering/hwrenderer/textures/hw_material.cpp b/src/rendering/hwrenderer/textures/hw_material.cpp index 4c4e37ca0e..774807779c 100644 --- a/src/rendering/hwrenderer/textures/hw_material.cpp +++ b/src/rendering/hwrenderer/textures/hw_material.cpp @@ -20,7 +20,7 @@ //-------------------------------------------------------------------------- // -#include "w_wad.h" +#include "filesystem.h" #include "m_png.h" #include "sbar.h" #include "stats.h" diff --git a/src/rendering/hwrenderer/textures/hw_precache.cpp b/src/rendering/hwrenderer/textures/hw_precache.cpp index 2e24e51108..ee474fe288 100644 --- a/src/rendering/hwrenderer/textures/hw_precache.cpp +++ b/src/rendering/hwrenderer/textures/hw_precache.cpp @@ -25,7 +25,7 @@ */ #include "c_cvars.h" -#include "w_wad.h" +#include "filesystem.h" #include "r_data/r_translate.h" #include "c_dispatch.h" #include "r_state.h" diff --git a/src/rendering/polyrenderer/drawers/poly_thread.cpp b/src/rendering/polyrenderer/drawers/poly_thread.cpp index 91d1ef1ca2..4613d65750 100644 --- a/src/rendering/polyrenderer/drawers/poly_thread.cpp +++ b/src/rendering/polyrenderer/drawers/poly_thread.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/rendering/polyrenderer/drawers/poly_triangle.cpp b/src/rendering/polyrenderer/drawers/poly_triangle.cpp index 8631138038..58aba69ced 100644 --- a/src/rendering/polyrenderer/drawers/poly_triangle.cpp +++ b/src/rendering/polyrenderer/drawers/poly_triangle.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/rendering/polyrenderer/drawers/screen_triangle.cpp b/src/rendering/polyrenderer/drawers/screen_triangle.cpp index c286b8c65a..45fe74b068 100644 --- a/src/rendering/polyrenderer/drawers/screen_triangle.cpp +++ b/src/rendering/polyrenderer/drawers/screen_triangle.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/rendering/swrenderer/drawers/r_draw.cpp b/src/rendering/swrenderer/drawers/r_draw.cpp index f4e3735fa8..671d398360 100644 --- a/src/rendering/swrenderer/drawers/r_draw.cpp +++ b/src/rendering/swrenderer/drawers/r_draw.cpp @@ -37,7 +37,7 @@ #include "templates.h" #include "doomdef.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/rendering/swrenderer/drawers/r_draw_rgba.cpp b/src/rendering/swrenderer/drawers/r_draw_rgba.cpp index a50221b3d8..07d8083602 100644 --- a/src/rendering/swrenderer/drawers/r_draw_rgba.cpp +++ b/src/rendering/swrenderer/drawers/r_draw_rgba.cpp @@ -37,7 +37,7 @@ #include "templates.h" #include "doomdef.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/rendering/swrenderer/drawers/r_thread.cpp b/src/rendering/swrenderer/drawers/r_thread.cpp index 5f1b8c6355..a12562cc7e 100644 --- a/src/rendering/swrenderer/drawers/r_thread.cpp +++ b/src/rendering/swrenderer/drawers/r_thread.cpp @@ -24,7 +24,7 @@ #include "templates.h" #include "doomdef.h" #include "i_system.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_video.h" #include "doomstat.h" #include "st_stuff.h" diff --git a/src/rendering/swrenderer/line/r_farclip_line.cpp b/src/rendering/swrenderer/line/r_farclip_line.cpp index 9e094768a5..6f4b919cf6 100644 --- a/src/rendering/swrenderer/line/r_farclip_line.cpp +++ b/src/rendering/swrenderer/line/r_farclip_line.cpp @@ -30,7 +30,7 @@ #include "r_sky.h" #include "v_video.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "stats.h" #include "a_sharedglobal.h" #include "d_net.h" diff --git a/src/rendering/swrenderer/line/r_fogboundary.cpp b/src/rendering/swrenderer/line/r_fogboundary.cpp index 09a6bce20a..03599193dc 100644 --- a/src/rendering/swrenderer/line/r_fogboundary.cpp +++ b/src/rendering/swrenderer/line/r_fogboundary.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/line/r_line.cpp b/src/rendering/swrenderer/line/r_line.cpp index 40427d3ff4..5bdebea0a8 100644 --- a/src/rendering/swrenderer/line/r_line.cpp +++ b/src/rendering/swrenderer/line/r_line.cpp @@ -32,7 +32,7 @@ #include "r_sky.h" #include "v_video.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "stats.h" #include "a_sharedglobal.h" #include "d_net.h" diff --git a/src/rendering/swrenderer/line/r_wallsetup.cpp b/src/rendering/swrenderer/line/r_wallsetup.cpp index b126cbe34f..d1ccb1514a 100644 --- a/src/rendering/swrenderer/line/r_wallsetup.cpp +++ b/src/rendering/swrenderer/line/r_wallsetup.cpp @@ -31,7 +31,7 @@ #include "r_sky.h" #include "v_video.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "stats.h" #include "a_sharedglobal.h" #include "d_net.h" diff --git a/src/rendering/swrenderer/plane/r_flatplane.cpp b/src/rendering/swrenderer/plane/r_flatplane.cpp index f9bad39ba4..e95bf450ef 100644 --- a/src/rendering/swrenderer/plane/r_flatplane.cpp +++ b/src/rendering/swrenderer/plane/r_flatplane.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" #include "engineerrors.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/plane/r_planerenderer.cpp b/src/rendering/swrenderer/plane/r_planerenderer.cpp index 5a07a319ad..f251d5c71e 100644 --- a/src/rendering/swrenderer/plane/r_planerenderer.cpp +++ b/src/rendering/swrenderer/plane/r_planerenderer.cpp @@ -25,7 +25,7 @@ #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/plane/r_skyplane.cpp b/src/rendering/swrenderer/plane/r_skyplane.cpp index 7df7cc3813..9a05b36d5c 100644 --- a/src/rendering/swrenderer/plane/r_skyplane.cpp +++ b/src/rendering/swrenderer/plane/r_skyplane.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/plane/r_slopeplane.cpp b/src/rendering/swrenderer/plane/r_slopeplane.cpp index e2249a30f8..156576d8a4 100644 --- a/src/rendering/swrenderer/plane/r_slopeplane.cpp +++ b/src/rendering/swrenderer/plane/r_slopeplane.cpp @@ -24,7 +24,7 @@ #include #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/plane/r_visibleplane.cpp b/src/rendering/swrenderer/plane/r_visibleplane.cpp index 828f15bab8..b6237c3ee1 100644 --- a/src/rendering/swrenderer/plane/r_visibleplane.cpp +++ b/src/rendering/swrenderer/plane/r_visibleplane.cpp @@ -25,7 +25,7 @@ #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/plane/r_visibleplanelist.cpp b/src/rendering/swrenderer/plane/r_visibleplanelist.cpp index d157bc42a7..50dc968970 100644 --- a/src/rendering/swrenderer/plane/r_visibleplanelist.cpp +++ b/src/rendering/swrenderer/plane/r_visibleplanelist.cpp @@ -25,7 +25,7 @@ #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/r_swcolormaps.cpp b/src/rendering/swrenderer/r_swcolormaps.cpp index 8fcdb22e25..6e6440f3e6 100644 --- a/src/rendering/swrenderer/r_swcolormaps.cpp +++ b/src/rendering/swrenderer/r_swcolormaps.cpp @@ -39,7 +39,7 @@ #include #include "i_system.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "r_sky.h" #include "c_dispatch.h" diff --git a/src/rendering/swrenderer/r_swscene.cpp b/src/rendering/swrenderer/r_swscene.cpp index 21eec408a3..26c596445b 100644 --- a/src/rendering/swrenderer/r_swscene.cpp +++ b/src/rendering/swrenderer/r_swscene.cpp @@ -29,7 +29,7 @@ #include "hwrenderer/textures/hw_material.h" #include "swrenderer/r_renderer.h" #include "r_swscene.h" -#include "w_wad.h" +#include "filesystem.h" #include "d_player.h" #include "textures/bitmap.h" #include "swrenderer/scene/r_light.h" diff --git a/src/rendering/swrenderer/scene/r_light.cpp b/src/rendering/swrenderer/scene/r_light.cpp index 0f4914ff6d..2a8fd5c759 100644 --- a/src/rendering/swrenderer/scene/r_light.cpp +++ b/src/rendering/swrenderer/scene/r_light.cpp @@ -25,7 +25,7 @@ #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/scene/r_scene.cpp b/src/rendering/swrenderer/scene/r_scene.cpp index a5d3a29f25..2cae785ed5 100644 --- a/src/rendering/swrenderer/scene/r_scene.cpp +++ b/src/rendering/swrenderer/scene/r_scene.cpp @@ -24,7 +24,7 @@ #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/swrenderer/scene/r_translucent_pass.cpp b/src/rendering/swrenderer/scene/r_translucent_pass.cpp index bcc91ac39c..347c32140f 100644 --- a/src/rendering/swrenderer/scene/r_translucent_pass.cpp +++ b/src/rendering/swrenderer/scene/r_translucent_pass.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "g_levellocals.h" #include "p_maputl.h" #include "swrenderer/things/r_visiblesprite.h" diff --git a/src/rendering/swrenderer/things/r_decal.cpp b/src/rendering/swrenderer/things/r_decal.cpp index 263b86d3a1..997fd25931 100644 --- a/src/rendering/swrenderer/things/r_decal.cpp +++ b/src/rendering/swrenderer/things/r_decal.cpp @@ -30,7 +30,7 @@ #include "r_sky.h" #include "v_video.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "stats.h" #include "a_sharedglobal.h" #include "d_net.h" diff --git a/src/rendering/swrenderer/things/r_particle.cpp b/src/rendering/swrenderer/things/r_particle.cpp index 0d9755a653..6aa2cdb595 100644 --- a/src/rendering/swrenderer/things/r_particle.cpp +++ b/src/rendering/swrenderer/things/r_particle.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "c_console.h" #include "c_cvars.h" #include "c_dispatch.h" diff --git a/src/rendering/swrenderer/things/r_playersprite.cpp b/src/rendering/swrenderer/things/r_playersprite.cpp index d12495bbd2..36cf89f197 100644 --- a/src/rendering/swrenderer/things/r_playersprite.cpp +++ b/src/rendering/swrenderer/things/r_playersprite.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "swrenderer/things/r_playersprite.h" #include "c_console.h" #include "c_cvars.h" diff --git a/src/rendering/swrenderer/things/r_sprite.cpp b/src/rendering/swrenderer/things/r_sprite.cpp index dca8dcff39..348cc1bf42 100644 --- a/src/rendering/swrenderer/things/r_sprite.cpp +++ b/src/rendering/swrenderer/things/r_sprite.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "swrenderer/things/r_wallsprite.h" #include "c_console.h" #include "c_cvars.h" diff --git a/src/rendering/swrenderer/things/r_visiblesprite.cpp b/src/rendering/swrenderer/things/r_visiblesprite.cpp index 53596f7c77..6a524c6e07 100644 --- a/src/rendering/swrenderer/things/r_visiblesprite.cpp +++ b/src/rendering/swrenderer/things/r_visiblesprite.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "g_levellocals.h" #include "p_maputl.h" #include "swrenderer/things/r_visiblesprite.h" diff --git a/src/rendering/swrenderer/things/r_visiblespritelist.cpp b/src/rendering/swrenderer/things/r_visiblespritelist.cpp index 95a4dfaca9..6c0f391740 100644 --- a/src/rendering/swrenderer/things/r_visiblespritelist.cpp +++ b/src/rendering/swrenderer/things/r_visiblespritelist.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "g_levellocals.h" #include "p_maputl.h" #include "swrenderer/things/r_visiblesprite.h" diff --git a/src/rendering/swrenderer/things/r_wallsprite.cpp b/src/rendering/swrenderer/things/r_wallsprite.cpp index b5ee7ba143..4663f6f367 100644 --- a/src/rendering/swrenderer/things/r_wallsprite.cpp +++ b/src/rendering/swrenderer/things/r_wallsprite.cpp @@ -27,7 +27,7 @@ #include "doomdef.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "swrenderer/things/r_wallsprite.h" #include "c_console.h" #include "c_cvars.h" diff --git a/src/rendering/swrenderer/viewport/r_viewport.cpp b/src/rendering/swrenderer/viewport/r_viewport.cpp index 42ef5be706..57c2f49c9c 100644 --- a/src/rendering/swrenderer/viewport/r_viewport.cpp +++ b/src/rendering/swrenderer/viewport/r_viewport.cpp @@ -24,7 +24,7 @@ #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomdef.h" #include "doomstat.h" #include "r_sky.h" diff --git a/src/rendering/v_video.cpp b/src/rendering/v_video.cpp index 9959bc511b..d4607dba5f 100644 --- a/src/rendering/v_video.cpp +++ b/src/rendering/v_video.cpp @@ -53,7 +53,7 @@ #include "v_text.h" #include "sc_man.h" -#include "w_wad.h" +#include "filesystem.h" #include "c_dispatch.h" #include "cmdlib.h" diff --git a/src/rendering/vulkan/renderer/vk_postprocess.cpp b/src/rendering/vulkan/renderer/vk_postprocess.cpp index 9ed14386b0..51105c811f 100644 --- a/src/rendering/vulkan/renderer/vk_postprocess.cpp +++ b/src/rendering/vulkan/renderer/vk_postprocess.cpp @@ -35,7 +35,7 @@ #include "hwrenderer/utility/hw_vrmodes.h" #include "hwrenderer/data/flatvertices.h" #include "r_videoscale.h" -#include "w_wad.h" +#include "filesystem.h" EXTERN_CVAR(Int, gl_dither_bpc) diff --git a/src/rendering/vulkan/shaders/vk_shader.cpp b/src/rendering/vulkan/shaders/vk_shader.cpp index ca6234cfbf..6432abc50e 100644 --- a/src/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/rendering/vulkan/shaders/vk_shader.cpp @@ -23,7 +23,7 @@ #include "vk_shader.h" #include "vulkan/system/vk_builders.h" #include "hwrenderer/utility/hw_shaderpatcher.h" -#include "w_wad.h" +#include "filesystem.h" #include "engineerrors.h" #include diff --git a/src/scripting/backend/codegen.cpp b/src/scripting/backend/codegen.cpp index e3499dda1a..78bbe2ada6 100644 --- a/src/scripting/backend/codegen.cpp +++ b/src/scripting/backend/codegen.cpp @@ -45,7 +45,7 @@ #include "p_lnspec.h" #include "codegen.h" #include "v_text.h" -#include "w_wad.h" +#include "filesystem.h" #include "doomstat.h" #include "g_levellocals.h" #include "v_video.h" diff --git a/src/scripting/decorate/thingdef_parse.cpp b/src/scripting/decorate/thingdef_parse.cpp index 38222062ec..adbeebe9e3 100644 --- a/src/scripting/decorate/thingdef_parse.cpp +++ b/src/scripting/decorate/thingdef_parse.cpp @@ -44,7 +44,7 @@ #include "thingdef.h" #include "a_morph.h" #include "backend/codegen.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_text.h" #include "m_argv.h" #include "v_video.h" diff --git a/src/scripting/thingdef_properties.cpp b/src/scripting/thingdef_properties.cpp index 65303c55c7..3eb02d2ca0 100644 --- a/src/scripting/thingdef_properties.cpp +++ b/src/scripting/thingdef_properties.cpp @@ -40,7 +40,7 @@ #include "gi.h" #include "d_player.h" -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "p_lnspec.h" #include "decallib.h" diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index 06a1d341bb..4ad4c8ac2e 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -35,7 +35,7 @@ #include "a_pickups.h" #include "thingdef.h" #include "c_console.h" -#include "w_wad.h" +#include "filesystem.h" #include "zcc_parser.h" #include "zcc-parse.h" #include "zcc_compile.h" diff --git a/src/scripting/zscript/zcc_parser.cpp b/src/scripting/zscript/zcc_parser.cpp index a059f096e6..6974278a96 100644 --- a/src/scripting/zscript/zcc_parser.cpp +++ b/src/scripting/zscript/zcc_parser.cpp @@ -33,7 +33,7 @@ #include "dobject.h" #include "sc_man.h" -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "m_argv.h" #include "v_text.h" diff --git a/src/serializer.cpp b/src/serializer.cpp index 146ac21141..4d3e78a777 100644 --- a/src/serializer.cpp +++ b/src/serializer.cpp @@ -46,7 +46,7 @@ #include "r_data/r_interpolate.h" #include "r_state.h" #include "p_lnspec.h" -#include "w_wad.h" +#include "filesystem.h" #include "p_terrain.h" #include "p_setup.h" #include "p_conversation.h" diff --git a/src/serializer.h b/src/serializer.h index 2d7e5da0ff..e0da50aedf 100644 --- a/src/serializer.h +++ b/src/serializer.h @@ -5,7 +5,7 @@ #include #include "tarray.h" #include "r_defs.h" -#include "resourcefiles/file_zip.h" +#include "file_zip.h" #include "tflags.h" #include "dictionary.h" diff --git a/src/sound/music/i_music.cpp b/src/sound/music/i_music.cpp index cea4de38bd..33f6d05b43 100644 --- a/src/sound/music/i_music.cpp +++ b/src/sound/music/i_music.cpp @@ -41,7 +41,7 @@ #include #include "m_argv.h" -#include "w_wad.h" +#include "filesystem.h" #include "c_dispatch.h" #include "templates.h" #include "stats.h" diff --git a/src/sound/music/i_soundfont.cpp b/src/sound/music/i_soundfont.cpp index 66d1647802..a8b4e9fdfd 100644 --- a/src/sound/music/i_soundfont.cpp +++ b/src/sound/music/i_soundfont.cpp @@ -41,7 +41,7 @@ #include "gameconfigfile.h" #include "filereadermusicinterface.h" #include -#include "resourcefiles/resourcefile.h" +#include "resourcefile.h" #include "version.h" #include "findfile.h" diff --git a/src/sound/music/i_soundfont.h b/src/sound/music/i_soundfont.h index 3ccdf82700..3a741a4d94 100644 --- a/src/sound/music/i_soundfont.h +++ b/src/sound/music/i_soundfont.h @@ -2,7 +2,7 @@ #include #include "doomtype.h" -#include "w_wad.h" +#include "filesystem.h" #include "files.h" #include "filereadermusicinterface.h" diff --git a/src/sound/s_advsound.cpp b/src/sound/s_advsound.cpp index 4738d92690..6c4b492690 100644 --- a/src/sound/s_advsound.cpp +++ b/src/sound/s_advsound.cpp @@ -37,7 +37,7 @@ #include "templates.h" #include "actor.h" #include "c_dispatch.h" -#include "w_wad.h" +#include "filesystem.h" #include "gi.h" #include "i_sound.h" #include "d_netinf.h" diff --git a/src/sound/s_doomsound.cpp b/src/sound/s_doomsound.cpp index 311fc17f51..156f98f117 100644 --- a/src/sound/s_doomsound.cpp +++ b/src/sound/s_doomsound.cpp @@ -49,7 +49,7 @@ #include "s_playlist.h" #include "c_dispatch.h" #include "m_random.h" -#include "w_wad.h" +#include "filesystem.h" #include "p_local.h" #include "doomstat.h" #include "cmdlib.h" diff --git a/src/sound/s_music.cpp b/src/sound/s_music.cpp index f602507a7d..85ab82cff6 100644 --- a/src/sound/s_music.cpp +++ b/src/sound/s_music.cpp @@ -68,7 +68,7 @@ #include "s_playlist.h" #include "c_dispatch.h" #include "m_random.h" -#include "w_wad.h" +#include "filesystem.h" #include "p_local.h" #include "doomstat.h" #include "cmdlib.h" diff --git a/src/sound/s_reverbedit.cpp b/src/sound/s_reverbedit.cpp index 461eacb763..f6f34e8d53 100644 --- a/src/sound/s_reverbedit.cpp +++ b/src/sound/s_reverbedit.cpp @@ -38,7 +38,7 @@ #include "sc_man.h" #include "cmdlib.h" #include "templates.h" -#include "w_wad.h" +#include "filesystem.h" #include "i_system.h" #include "m_misc.h" diff --git a/src/sound/s_sndseq.cpp b/src/sound/s_sndseq.cpp index 06931c01f6..a2be7721cf 100644 --- a/src/sound/s_sndseq.cpp +++ b/src/sound/s_sndseq.cpp @@ -28,7 +28,7 @@ #include "m_random.h" #include "s_sound.h" #include "s_sndseq.h" -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "p_local.h" #include "po_man.h" diff --git a/src/utility/sc_man.cpp b/src/utility/sc_man.cpp index 0fd5fd2b35..4cf4f258b5 100644 --- a/src/utility/sc_man.cpp +++ b/src/utility/sc_man.cpp @@ -40,7 +40,7 @@ #include "doomtype.h" #include "engineerrors.h" #include "sc_man.h" -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "templates.h" #include "doomstat.h" diff --git a/src/utility/v_collection.cpp b/src/utility/v_collection.cpp index 053eeec45d..51cdd3a754 100644 --- a/src/utility/v_collection.cpp +++ b/src/utility/v_collection.cpp @@ -35,7 +35,7 @@ #include "v_collection.h" #include "v_font.h" #include "v_video.h" -#include "w_wad.h" +#include "filesystem.h" FImageCollection::FImageCollection () { diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index 2a05e53759..29a7957baa 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -38,7 +38,7 @@ #include "m_random.h" #include "m_swap.h" -#include "w_wad.h" +#include "filesystem.h" #include "g_level.h" #include "s_sound.h" #include "doomstat.h" diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index a5a0246bef..9a591e27d0 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -64,7 +64,7 @@ #include "c_console.h" #include "version.h" #include "i_input.h" -#include "w_wad.h" +#include "filesystem.h" #include "cmdlib.h" #include "g_game.h" #include "r_utility.h" diff --git a/src/win32/st_start.cpp b/src/win32/st_start.cpp index fc85b9b90c..030e341931 100644 --- a/src/win32/st_start.cpp +++ b/src/win32/st_start.cpp @@ -46,7 +46,7 @@ #include "i_input.h" #include "hardware.h" #include "gi.h" -#include "w_wad.h" +#include "filesystem.h" #include "s_sound.h" #include "m_argv.h" #include "d_main.h" diff --git a/src/win32/st_start_util.cpp b/src/win32/st_start_util.cpp index 9f1f1b0c26..730ea31aa4 100644 --- a/src/win32/st_start_util.cpp +++ b/src/win32/st_start_util.cpp @@ -37,7 +37,7 @@ #include #include "st_start.h" #include "m_alloc.h" -#include "w_wad.h" +#include "filesystem.h" #include "v_palette.h" #include "s_sound.h" #include "s_music.h"