- removed unneeded includes of r_local.h.

SVN r3261 (trunk)

src/farchive.cpp

@@ -55,7 +55,6 @@
 #include "c_dispatch.h"
 #include "d_player.h"
 #include "dobject.h"
-#include "r_local.h"
 
 // These are special tokens found in the data stream of an archive.
 // Whenever a new object is encountered, it gets created using new and

src/fragglescript/t_script.cpp

@@ -45,7 +45,6 @@
 //
 //
 
-#include "r_local.h"
 #include "t_script.h"
 #include "p_lnspec.h"
 #include "a_keys.h"

src/g_shared/sbarinfo.cpp

@@ -43,7 +43,6 @@
 #include "m_random.h"
 #include "d_player.h"
 #include "st_stuff.h"
-#include "r_local.h"
 #include "m_swap.h"
 #include "a_keys.h"
 #include "templates.h"

src/g_strife/strife_sbar.cpp

@@ -8,7 +8,7 @@
 #include "m_random.h"
 #include "d_player.h"
 #include "st_stuff.h"
-#include "r_local.h"
+#include "r_utility.h"
 #include "m_swap.h"
 #include "templates.h"
 #include "a_keys.h"

src/p_local.h

@@ -29,9 +29,6 @@
 #include "r_state.h"
 #include "r_utility.h"
 #include "d_player.h"
-#ifndef __R_LOCAL__
-//#include "r_local.h"
-#endif
 
 #include "a_morph.h"
 

src/p_spec.cpp

@@ -44,7 +44,6 @@
 #include "m_bbox.h"
 #include "w_wad.h"
 
-#include "r_local.h"
 #include "p_local.h"
 #include "p_lnspec.h"
 #include "p_terrain.h"

src/po_man.cpp

@@ -14,7 +14,6 @@
 
 #include "doomdef.h"
 #include "p_local.h"
-#include "r_local.h"
 #include "i_system.h"
 #include "w_wad.h"
 #include "m_swap.h"

src/r_data/colormaps.cpp

@@ -40,7 +40,6 @@
 #include "i_system.h"
 #include "w_wad.h"
 #include "doomdef.h"
-#include "r_local.h"
 #include "r_sky.h"
 #include "c_dispatch.h"
 #include "sc_man.h"
@@ -51,6 +50,8 @@
 #include "colormatcher.h"
 #include "colormaps.h"
 #include "v_video.h"
+#include "templates.h"
+#include "r_utility.h"
 
 static bool R_CheckForFixedLights(const BYTE *colormaps);
 

src/r_data/voxels.cpp

@@ -42,7 +42,6 @@
 #include "m_argv.h"
 #include "i_system.h"
 #include "w_wad.h"
-#include "r_local.h"
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -61,6 +60,7 @@
 #include "v_palette.h"
 #include "r_data/r_translate.h"
 #include "r_data/colormaps.h"
+#include "r_data/sprites.h"
 #include "voxels.h"
 
 void VOX_AddVoxel(int sprnum, int frame, FVoxelDef *def);

src/textures/animations.cpp

@@ -35,7 +35,6 @@
 #include "doomtype.h"
 #include "cmdlib.h"
 #include "i_system.h"
-#include "r_local.h"
 #include "r_sky.h"
 #include "m_random.h"
 #include "d_player.h"

src/textures/buildtexture.cpp

@@ -35,12 +35,12 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "cmdlib.h"
 #include "st_start.h"
 #include "textures/textures.h"
+#include "r_data/sprites.h"
 
 //==========================================================================
 //

src/textures/ddstexture.cpp

@@ -50,7 +50,6 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "bitmap.h"

src/textures/pcxtexture.cpp

@@ -36,7 +36,6 @@
 
 #include "doomtype.h"
 #include "files.h"
-#include "r_local.h"
 #include "w_wad.h"
 #include "templates.h"
 #include "bitmap.h"

src/textures/pngtexture.cpp

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

src/textures/tgatexture.cpp

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

src/wi_stuff.cpp

@@ -32,7 +32,6 @@
 #include "w_wad.h"
 #include "g_game.h"
 #include "g_level.h"
-#include "r_local.h"
 #include "s_sound.h"
 #include "doomstat.h"
 #include "v_video.h"
@@ -45,6 +44,9 @@
 #include "sc_man.h"
 #include "v_text.h"
 #include "gi.h"
+#include "d_player.h"
+#include "b_bot.h"
+#include "textures/textures.h"
 #include "r_data/r_translate.h"
 #include "templates.h"
 #include "gstrings.h"