From 5c6fd66ed5c680b43c90c80140b28254142d5c63 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 6 Jul 2011 07:35:36 +0000 Subject: [PATCH] - rename src/resources to src/r_data. SVN r3254 (trunk) --- src/CMakeLists.txt | 6 +++--- src/actor.h | 2 +- src/am_map.cpp | 2 +- src/decallib.h | 2 +- src/fragglescript/t_func.cpp | 2 +- src/g_game.cpp | 2 +- src/g_level.cpp | 2 +- src/g_shared/a_artifacts.cpp | 2 +- src/p_3dfloors.cpp | 2 +- src/p_buildmap.cpp | 2 +- src/p_lnspec.cpp | 2 +- src/p_mobj.cpp | 2 +- src/p_saveg.cpp | 2 +- src/p_sectors.cpp | 2 +- src/p_setup.cpp | 2 +- src/p_udmf.cpp | 2 +- src/r_bsp.cpp | 2 +- src/{resources => r_data}/colormaps.cpp | 0 src/{resources => r_data}/colormaps.h | 0 src/{resources => r_data}/renderstyle.cpp | 0 src/{resources => r_data}/renderstyle.h | 0 src/{resources => r_data}/voxels.cpp | 2 +- src/{resources => r_data}/voxels.h | 0 src/r_draw.cpp | 2 +- src/r_main.cpp | 2 +- src/r_main.h | 2 +- src/r_plane.cpp | 2 +- src/r_polymost.cpp | 2 +- src/r_segs.cpp | 2 +- src/r_things.cpp | 4 ++-- src/r_translate.cpp | 2 +- src/textures/bitmap.cpp | 2 +- src/textures/multipatchtexture.cpp | 2 +- src/thingdef/thingdef_properties.cpp | 2 +- src/v_draw.cpp | 2 +- src/v_palette.cpp | 2 +- src/v_video.cpp | 2 +- src/v_video.h | 2 +- src/win32/fb_d3d9.cpp | 2 +- zdoom.vcproj | 12 ++++++------ 40 files changed, 43 insertions(+), 43 deletions(-) rename src/{resources => r_data}/colormaps.cpp (100%) rename src/{resources => r_data}/colormaps.h (100%) rename src/{resources => r_data}/renderstyle.cpp (100%) rename src/{resources => r_data}/renderstyle.h (100%) rename src/{resources => r_data}/voxels.cpp (95%) rename src/{resources => r_data}/voxels.h (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 363dd01f6..ec77861e0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -903,9 +903,9 @@ add_executable( zdoom WIN32 fragglescript/t_spec.cpp fragglescript/t_variable.cpp fragglescript/t_cmd.cpp - resources/colormaps.cpp - resources/voxels.cpp - resources/renderstyle.cpp + r_data/colormaps.cpp + r_data/voxels.cpp + r_data/renderstyle.cpp autozend.cpp ) diff --git a/src/actor.h b/src/actor.h index 2d148509b..e7dece16b 100644 --- a/src/actor.h +++ b/src/actor.h @@ -37,7 +37,7 @@ #include "doomdef.h" #include "textures/textures.h" -#include "resources/renderstyle.h" +#include "r_data/renderstyle.h" #include "s_sound.h" #include "memarena.h" diff --git a/src/am_map.cpp b/src/am_map.cpp index 4fa8149ae..6a2d19699 100644 --- a/src/am_map.cpp +++ b/src/am_map.cpp @@ -63,7 +63,7 @@ #include "a_artifacts.h" #include "po_man.h" #include "a_keys.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" //============================================================================= // diff --git a/src/decallib.h b/src/decallib.h index a67aab44d..4b4571922 100644 --- a/src/decallib.h +++ b/src/decallib.h @@ -37,7 +37,7 @@ #include #include "doomtype.h" -#include "resources/renderstyle.h" +#include "r_data/renderstyle.h" #include "textures/textures.h" class FScanner; diff --git a/src/fragglescript/t_func.cpp b/src/fragglescript/t_func.cpp index 5315134ee..d592f9f50 100644 --- a/src/fragglescript/t_func.cpp +++ b/src/fragglescript/t_func.cpp @@ -65,7 +65,7 @@ #include "g_level.h" #include "v_palette.h" #include "v_font.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" static FRandom pr_script("FScript"); diff --git a/src/g_game.cpp b/src/g_game.cpp index 6feb318f5..9fa73aca9 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -78,7 +78,7 @@ #include "d_event.h" #include "p_acs.h" #include "m_joy.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #include diff --git a/src/g_level.cpp b/src/g_level.cpp index 5167908af..cc3896e0d 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -78,7 +78,7 @@ #include "v_palette.h" #include "menu/menu.h" #include "a_strifeglobal.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #include "gi.h" diff --git a/src/g_shared/a_artifacts.cpp b/src/g_shared/a_artifacts.cpp index 98f93ebc3..3fab6b55a 100644 --- a/src/g_shared/a_artifacts.cpp +++ b/src/g_shared/a_artifacts.cpp @@ -19,7 +19,7 @@ #include "g_level.h" #include "doomstat.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" static FRandom pr_torch ("Torch"); diff --git a/src/p_3dfloors.cpp b/src/p_3dfloors.cpp index e538b747c..04687ac12 100644 --- a/src/p_3dfloors.cpp +++ b/src/p_3dfloors.cpp @@ -41,7 +41,7 @@ #include "w_wad.h" #include "sc_man.h" #include "g_level.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #ifdef _3DFLOORS diff --git a/src/p_buildmap.cpp b/src/p_buildmap.cpp index 1290c3efc..69287f298 100644 --- a/src/p_buildmap.cpp +++ b/src/p_buildmap.cpp @@ -16,7 +16,7 @@ #include "r_defs.h" #include "p_setup.h" #include "g_level.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // MACROS ------------------------------------------------------------------ diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 7f5376116..2985ed4be 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -56,7 +56,7 @@ #include "p_3dmidtex.h" #include "d_net.h" #include "d_event.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #define FUNC(a) static int a (line_t *ln, AActor *it, bool backSide, \ int arg0, int arg1, int arg2, int arg3, int arg4) diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp index 457c64711..9c3c84d6f 100644 --- a/src/p_mobj.cpp +++ b/src/p_mobj.cpp @@ -61,7 +61,7 @@ #include "v_palette.h" #include "p_enemy.h" #include "gstrings.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // MACROS ------------------------------------------------------------------ diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index b26e0f244..08de630db 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -48,7 +48,7 @@ #include "g_level.h" #include "po_man.h" #include "p_setup.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" static void CopyPlayer (player_t *dst, player_t *src, const char *name); static void ReadOnePlayer (FArchive &arc, bool skipload); diff --git a/src/p_sectors.cpp b/src/p_sectors.cpp index 0f1da2dd2..a54033b0d 100644 --- a/src/p_sectors.cpp +++ b/src/p_sectors.cpp @@ -28,7 +28,7 @@ #include "r_main.h" #include "nodebuild.h" #include "po_man.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // [RH] diff --git a/src/p_setup.cpp b/src/p_setup.cpp index 385467199..0b4fd3dc2 100644 --- a/src/p_setup.cpp +++ b/src/p_setup.cpp @@ -66,7 +66,7 @@ #include "md5.h" #include "compatibility.h" #include "po_man.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #include "fragglescript/t_fs.h" diff --git a/src/p_udmf.cpp b/src/p_udmf.cpp index 1ad67850e..53922ab61 100644 --- a/src/p_udmf.cpp +++ b/src/p_udmf.cpp @@ -43,7 +43,7 @@ #include "v_palette.h" #include "p_udmf.h" #include "r_state.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" //=========================================================================== // diff --git a/src/r_bsp.cpp b/src/r_bsp.cpp index c20e46d7c..4758ae7d2 100644 --- a/src/r_bsp.cpp +++ b/src/r_bsp.cpp @@ -53,7 +53,7 @@ #include "v_palette.h" #include "r_sky.h" #include "po_man.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" int WallMost (short *mostbuf, const secplane_t &plane); diff --git a/src/resources/colormaps.cpp b/src/r_data/colormaps.cpp similarity index 100% rename from src/resources/colormaps.cpp rename to src/r_data/colormaps.cpp diff --git a/src/resources/colormaps.h b/src/r_data/colormaps.h similarity index 100% rename from src/resources/colormaps.h rename to src/r_data/colormaps.h diff --git a/src/resources/renderstyle.cpp b/src/r_data/renderstyle.cpp similarity index 100% rename from src/resources/renderstyle.cpp rename to src/r_data/renderstyle.cpp diff --git a/src/resources/renderstyle.h b/src/r_data/renderstyle.h similarity index 100% rename from src/resources/renderstyle.h rename to src/r_data/renderstyle.h diff --git a/src/resources/voxels.cpp b/src/r_data/voxels.cpp similarity index 95% rename from src/resources/voxels.cpp rename to src/r_data/voxels.cpp index 15ed679bd..eeed03790 100644 --- a/src/resources/voxels.cpp +++ b/src/r_data/voxels.cpp @@ -63,7 +63,7 @@ #include "r_segs.h" #include "v_palette.h" #include "r_translate.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #include "voxels.h" void VOX_AddVoxel(int sprnum, int frame, FVoxelDef *def); diff --git a/src/resources/voxels.h b/src/r_data/voxels.h similarity index 100% rename from src/resources/voxels.h rename to src/r_data/voxels.h diff --git a/src/r_draw.cpp b/src/r_draw.cpp index 42845bdf9..ae8e93a10 100644 --- a/src/r_draw.cpp +++ b/src/r_draw.cpp @@ -38,7 +38,7 @@ #include "g_level.h" #include "r_translate.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #include "gi.h" #include "stats.h" diff --git a/src/r_main.cpp b/src/r_main.cpp index 172c0c773..a5d58c221 100644 --- a/src/r_main.cpp +++ b/src/r_main.cpp @@ -54,7 +54,7 @@ #include "po_man.h" #include "st_start.h" #include "v_font.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // MACROS ------------------------------------------------------------------ diff --git a/src/r_main.h b/src/r_main.h index 8fda1f416..3dff4a79d 100644 --- a/src/r_main.h +++ b/src/r_main.h @@ -30,7 +30,7 @@ #include "d_player.h" #include "r_state.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // diff --git a/src/r_plane.cpp b/src/r_plane.cpp index bb0ddb7d4..4275f553c 100644 --- a/src/r_plane.cpp +++ b/src/r_plane.cpp @@ -57,7 +57,7 @@ #include "r_segs.h" #include "r_3dfloors.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #ifdef _MSC_VER #pragma warning(disable:4244) diff --git a/src/r_polymost.cpp b/src/r_polymost.cpp index 3d4ea5232..4cee72f01 100644 --- a/src/r_polymost.cpp +++ b/src/r_polymost.cpp @@ -82,7 +82,7 @@ Low priority: #include "v_palette.h" #include "v_font.h" #include "v_video.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" EXTERN_CVAR (Int, r_polymost) diff --git a/src/r_segs.cpp b/src/r_segs.cpp index 4dc1c556d..7e69190e5 100644 --- a/src/r_segs.cpp +++ b/src/r_segs.cpp @@ -51,7 +51,7 @@ #include "r_segs.h" #include "r_3dfloors.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #define WALLYREPEAT 8 diff --git a/src/r_things.cpp b/src/r_things.cpp index a464febaf..a069b6be1 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -59,8 +59,8 @@ #include "r_3dfloors.h" #include "v_palette.h" #include "r_translate.h" -#include "resources/colormaps.h" -#include "resources/voxels.h" +#include "r_data/colormaps.h" +#include "r_data/voxels.h" extern fixed_t globaluclip, globaldclip; diff --git a/src/r_translate.cpp b/src/r_translate.cpp index fc3d1274e..ad1c845a6 100644 --- a/src/r_translate.cpp +++ b/src/r_translate.cpp @@ -47,7 +47,7 @@ #include "doomerrors.h" #include "i_system.h" #include "w_wad.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" #include "gi.h" #include "stats.h" diff --git a/src/textures/bitmap.cpp b/src/textures/bitmap.cpp index beec0d3fb..035474f7b 100644 --- a/src/textures/bitmap.cpp +++ b/src/textures/bitmap.cpp @@ -36,7 +36,7 @@ #include "templates.h" #include "r_translate.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" //=========================================================================== diff --git a/src/textures/multipatchtexture.cpp b/src/textures/multipatchtexture.cpp index d75dc6b0e..de56062d5 100644 --- a/src/textures/multipatchtexture.cpp +++ b/src/textures/multipatchtexture.cpp @@ -49,7 +49,7 @@ #include "v_video.h" #include "m_fixed.h" #include "textures/textures.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // On the Alpha, accessing the shorts directly if they aren't aligned on a // 4-byte boundary causes unaligned access warnings. Why it does this at diff --git a/src/thingdef/thingdef_properties.cpp b/src/thingdef/thingdef_properties.cpp index 487a5fdda..542703c1e 100644 --- a/src/thingdef/thingdef_properties.cpp +++ b/src/thingdef/thingdef_properties.cpp @@ -69,7 +69,7 @@ #include "colormatcher.h" #include "teaminfo.h" #include "v_video.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" //========================================================================== diff --git a/src/v_draw.cpp b/src/v_draw.cpp index fd115a27f..8d60e7562 100644 --- a/src/v_draw.cpp +++ b/src/v_draw.cpp @@ -54,7 +54,7 @@ #include "templates.h" #include "d_net.h" #include "colormatcher.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // [RH] Stretch values to make a 320x200 image best fit the screen // without using fractional steppings diff --git a/src/v_palette.cpp b/src/v_palette.cpp index 605a57fa7..a745d3c53 100644 --- a/src/v_palette.cpp +++ b/src/v_palette.cpp @@ -57,7 +57,7 @@ #include "x86.h" #include "colormatcher.h" #include "v_palette.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" FPalette GPalette; FColorMatcher ColorMatcher; diff --git a/src/v_video.cpp b/src/v_video.cpp index b6289077c..96e1cee77 100644 --- a/src/v_video.cpp +++ b/src/v_video.cpp @@ -63,7 +63,7 @@ #include "v_palette.h" #include "r_sky.h" #include "menu/menu.h" -#include "resources/voxels.h" +#include "r_data/voxels.h" IMPLEMENT_ABSTRACT_CLASS (DCanvas) diff --git a/src/v_video.h b/src/v_video.h index d3fbd8de2..b414d6658 100644 --- a/src/v_video.h +++ b/src/v_video.h @@ -38,7 +38,7 @@ #include "doomdef.h" #include "dobject.h" -#include "resources/renderstyle.h" +#include "r_data/renderstyle.h" #include "c_cvars.h" extern int CleanWidth, CleanHeight, CleanXfac, CleanYfac; diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index 48c6423e3..c53b1ea09 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -71,7 +71,7 @@ #include "doomstat.h" #include "v_palette.h" #include "w_wad.h" -#include "resources/colormaps.h" +#include "r_data/colormaps.h" // MACROS ------------------------------------------------------------------ diff --git a/zdoom.vcproj b/zdoom.vcproj index fc39da840..3f86c8f46 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -6629,15 +6629,15 @@ Name="Resource Headers" > @@ -6645,15 +6645,15 @@ Name="Resource Sources" >