more cleanups

jezze · jezze · commit 37d5185ae12f · 2014-04-03T23:10:21.000+02:00
diff --git a/d_main.c b/d_main.c
@@ -4,8 +4,9 @@
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include "d_think.h"
 #include "doomdef.h"
+#include "d_think.h"
+#include "p_pspr.h"
 #include "doomtype.h"
 #include "doomstat.h"
 #include "d_englsh.h"
diff --git a/d_player.h b/d_player.h
@@ -2,7 +2,6 @@
 #define __D_PLAYER__
 
 #include "d_items.h"
-#include "p_pspr.h"
 #include "p_mobj.h"
 #include "d_main.h"
 
diff --git a/doomdef.h b/doomdef.h
@@ -1,10 +1,6 @@
 #ifndef __DOOMDEF__
 #define __DOOMDEF__
 
-#ifndef __GNUC__
-#define __attribute__(x)
-#endif
-
 #define MAX_SCREENWIDTH  2048
 #define MAX_SCREENHEIGHT 1536
 #define MAXPLAYERS       4
diff --git a/doomstat.c b/doomstat.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 
 GameMode_t gamemode = indetermined;
diff --git a/doomtype.h b/doomtype.h
@@ -18,33 +18,6 @@ typedef unsigned long long uint_64_t;
 
 #include <limits.h>
 
-typedef enum
-{
-
-    doom_12_compatibility,
-    doom_1666_compatibility,
-    doom2_19_compatibility,
-    ultdoom_compatibility,
-    finaldoom_compatibility,
-    dosdoom_compatibility,
-    tasdoom_compatibility,
-    boom_compatibility_compatibility,
-    boom_201_compatibility,
-    boom_202_compatibility,
-    lxdoom_1_compatibility,
-    mbf_compatibility,
-    prboom_1_compatibility,
-    prboom_2_compatibility,
-    prboom_3_compatibility,
-    prboom_4_compatibility,
-    prboom_5_compatibility,
-    prboom_6_compatibility,
-    MAX_COMPATIBILITY_LEVEL,
-    boom_compatibility = boom_201_compatibility,
-    best_compatibility = prboom_6_compatibility
-
-} complevel_t;
-
 enum patch_translation_e
 {
 
diff --git a/f_finale.c b/f_finale.c
@@ -4,6 +4,7 @@
 #include <ctype.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "d_event.h"
 #include "v_video.h"
diff --git a/f_finale.h b/f_finale.h
@@ -1,9 +1,6 @@
 #ifndef __F_FINALE__
 #define __F_FINALE__
 
-#include "doomtype.h"
-#include "d_event.h"
-
 boolean F_Responder(event_t *ev);
 
 void F_Ticker(void);
diff --git a/g_game.c b/g_game.c
@@ -5,6 +5,7 @@
 #include <fcntl.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "f_finale.h"
 #include "m_misc.h"
diff --git a/g_game.h b/g_game.h
@@ -1,8 +1,6 @@
 #ifndef __G_GAME__
 #define __G_GAME__
 
-#include "doomdef.h"
-
 #define GAME_OPTION_SIZE                64
 
 boolean G_Responder(event_t *ev);
diff --git a/hu_stuff.c b/hu_stuff.c
@@ -4,6 +4,7 @@
 #include <ctype.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "hu_stuff.h"
 #include "i_video.h"
diff --git a/hu_stuff.h b/hu_stuff.h
@@ -3,7 +3,6 @@
 
 #include "d_event.h"
 #include "r_defs.h"
-#include "v_video.h"
 
 #define HU_FONTSTART                    '!'
 #define HU_FONTEND                      0x7f
diff --git a/m_cheat.c b/m_cheat.c
@@ -2,6 +2,7 @@
 #include <ctype.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "g_game.h"
 #include "r_data.h"
diff --git a/m_menu.c b/m_menu.c
@@ -1,7 +1,8 @@
 #include <stdio.h>
 #include <fcntl.h>
-#include "d_think.h"
 #include "doomdef.h"
+#include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "d_englsh.h"
 #include "d_main.h"
diff --git a/m_misc.c b/m_misc.c
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "g_game.h"
 #include "m_menu.h"
diff --git a/m_random.c b/m_random.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "m_random.h"
 
diff --git a/p_ceilng.c b/p_ceilng.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_spec.h"
diff --git a/p_doors.c b/p_doors.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "p_spec.h"
 #include "p_tick.h"
diff --git a/p_enemy.c b/p_enemy.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "m_random.h"
 #include "r_main.h"
diff --git a/p_floor.c b/p_floor.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_map.h"
diff --git a/p_genlin.c b/p_genlin.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_spec.h"
diff --git a/p_inter.c b/p_inter.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "d_event.h"
 #include "d_englsh.h"
diff --git a/p_lights.c b/p_lights.c
@@ -2,8 +2,8 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
-#include "doomdef.h"
 #include "m_random.h"
 #include "r_main.h"
 #include "p_spec.h"
diff --git a/p_map.c b/p_map.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_mobj.h"
diff --git a/p_maputl.c b/p_maputl.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_maputl.h"
diff --git a/p_mobj.c b/p_mobj.c
@@ -1,7 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
-#include "d_think.h"
 #include "doomdef.h"
+#include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "m_random.h"
 #include "r_main.h"
diff --git a/p_plats.c b/p_plats.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "m_random.h"
 #include "r_main.h"
diff --git a/p_pspr.c b/p_pspr.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_map.h"
diff --git a/p_setup.c b/p_setup.c
@@ -4,6 +4,7 @@
 #include <math.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "g_game.h"
 #include "w_wad.h"
diff --git a/p_sight.c b/p_sight.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "p_map.h"
diff --git a/p_spec.c b/p_spec.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "p_spec.h"
 #include "p_tick.h"
diff --git a/p_switch.c b/p_switch.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "w_wad.h"
 #include "r_main.h"
diff --git a/p_telept.c b/p_telept.c
@@ -1,7 +1,8 @@
 #include <stdlib.h>
 #include <string.h>
-#include "d_think.h"
 #include "doomdef.h"
+#include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "p_spec.h"
 #include "p_maputl.h"
diff --git a/p_tick.c b/p_tick.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "p_user.h"
 #include "p_spec.h"
diff --git a/p_user.c b/p_user.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "d_event.h"
 #include "r_main.h"
diff --git a/r_bsp.c b/r_bsp.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "r_segs.h"
diff --git a/r_data.c b/r_data.c
@@ -3,6 +3,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "w_wad.h"
 #include "r_draw.h"
diff --git a/r_draw.c b/r_draw.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "w_wad.h"
 #include "r_main.h"
diff --git a/r_main.c b/r_main.c
@@ -3,6 +3,7 @@
 #include <math.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "d_main.h"
 #include "w_wad.h"
diff --git a/r_patch.c b/r_patch.c
@@ -3,6 +3,7 @@
 #include <assert.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "z_zone.h"
 #include "doomstat.h"
 #include "w_wad.h"
diff --git a/r_plane.c b/r_plane.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "z_zone.h"
 #include "doomstat.h"
 #include "w_wad.h"
diff --git a/r_segs.c b/r_segs.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "r_main.h"
 #include "r_bsp.h"
diff --git a/r_things.c b/r_things.c
@@ -2,6 +2,7 @@
 #include <string.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "w_wad.h"
 #include "r_main.h"
diff --git a/s_sound.c b/s_sound.c
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include "doomdef.h"
 #include "d_think.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "s_sound.h"
 #include "i_sound.h"
diff --git a/sdl/i_sound.c b/sdl/i_sound.c
@@ -13,6 +13,7 @@
 #include "i_system.h"
 #include "s_sound.h"
 #include "doomdef.h"
+#include "p_pspr.h"
 #include "doomstat.h"
 #include "doomtype.h"
 #include "d_main.h"
diff --git a/sdl/i_system.c b/sdl/i_system.c
diff --git a/sdl/i_video.c b/sdl/i_video.c
diff --git a/st_stuff.c b/st_stuff.c
diff --git a/v_video.c b/v_video.c
diff --git a/w_wad.c b/w_wad.c
diff --git a/wi_stuff.c b/wi_stuff.c
diff --git a/z_zone.c b/z_zone.c
