- rename src/resources to src/r_data.

SVN r3254 (trunk)

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
+	r_data/colormaps.cpp
-	resources/voxels.cpp
+	r_data/voxels.cpp
-	resources/renderstyle.cpp
+	r_data/renderstyle.cpp
 	autozend.cpp
 )
 

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"
 

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"
 
 //=============================================================================
 //

src/decallib.h

@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include "doomtype.h"
-#include "resources/renderstyle.h"
+#include "r_data/renderstyle.h"
 #include "textures/textures.h"
 
 class FScanner;

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");
 

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 <zlib.h>
 

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"
 

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");
 

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
 

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 ------------------------------------------------------------------
 

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)

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 ------------------------------------------------------------------
 

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);

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]

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"
 

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"
 
 //===========================================================================
 //

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);
 

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);

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"

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 ------------------------------------------------------------------
 

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"
 
 
 //

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)

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)
 

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
 

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 "r_data/colormaps.h"
-#include "resources/voxels.h"
+#include "r_data/voxels.h"
 
 extern fixed_t globaluclip, globaldclip;
 

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"

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"
 
 
 //===========================================================================

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

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"
 
 
 //==========================================================================

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

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;

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)

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;

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 ------------------------------------------------------------------
 

zdoom.vcproj

@@ -6629,15 +6629,15 @@
 				Name="Resource Headers"
 				>
 				<File
-					RelativePath=".\src\resources\colormaps.h"
+					RelativePath=".\src\r_data\colormaps.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\renderstyle.h"
+					RelativePath=".\src\r_data\renderstyle.h"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\voxels.h"
+					RelativePath=".\src\r_data\voxels.h"
 					>
 				</File>
 			</Filter>
@@ -6645,15 +6645,15 @@
 				Name="Resource Sources"
 				>
 				<File
-					RelativePath=".\src\resources\colormaps.cpp"
+					RelativePath=".\src\r_data\colormaps.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\renderstyle.cpp"
+					RelativePath=".\src\r_data\renderstyle.cpp"
 					>
 				</File>
 				<File
-					RelativePath=".\src\resources\voxels.cpp"
+					RelativePath=".\src\r_data\voxels.cpp"
 					>
 				</File>
 			</Filter>