Enable gcc warning to detect redundant declarations, and clean up

instances of this within the code (thanks Edward-san).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2468

11 files changed, 4 insertions, 63 deletions

diff --git a/src/heretic/ct_chat.c b/src/heretic/ct_chat.c
index 4b89fe89..19c27bb2 100644
--- a/src/heretic/ct_chat.c
+++ b/src/heretic/ct_chat.c
@@ -51,11 +51,6 @@
 
 // Public data
 
-void CT_Init(void);
-void CT_Drawer(void);
-boolean CT_Responder(event_t * ev);
-void CT_Ticker(void);
-char CT_dequeueChatChar(void);
 
 boolean chatmodeon;
 
diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index a34ef3ac..d1c74b7c 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -91,7 +91,6 @@ static int show_endoom = 1;
 void D_CheckNetGame(void);
 void D_PageDrawer(void);
 void D_AdvanceDemo(void);
-void F_Drawer(void);
 boolean F_Responder(event_t * ev);
 
 //---------------------------------------------------------------------------
@@ -152,7 +151,6 @@ extern boolean finalestage;
 
 void D_Display(void)
 {
-    extern boolean MenuActive;
     extern boolean askforquit;
 
     // Change the view size if needed
@@ -308,8 +306,6 @@ void D_PageTicker(void)
 ================
 */
 
-extern boolean MenuActive;
-
 void D_PageDrawer(void)
 {
     V_DrawRawScreen(W_CacheLumpName(pagename, PU_CACHE));
diff --git a/src/heretic/doomdef.h b/src/heretic/doomdef.h
index 3209cbe4..9f6122d8 100644
--- a/src/heretic/doomdef.h
+++ b/src/heretic/doomdef.h
@@ -533,7 +533,6 @@ extern player_t players[MAXPLAYERS];
 
 extern boolean DebugSound;      // debug flag for displaying sound info
 
-extern int maxammo[NUMAMMO];
 extern int GetWeaponAmmo[NUMWEAPONS];
 
 extern boolean demorecording;
@@ -561,12 +560,6 @@ extern mapthing_t *deathmatch_p;
 extern mapthing_t deathmatchstarts[10];
 extern mapthing_t playerstarts[MAXPLAYERS];
 
-extern int viewwindowx;
-extern int viewwindowy;
-extern int viewwidth;
-extern int scaledviewwidth;
-extern int viewheight;
-
 extern int mouseSensitivity;
 
 extern boolean precache;        // if true, load all graphics at level load
@@ -611,27 +604,9 @@ void D_DoomLoop(void);
 // calls all ?_Responder, ?_Ticker, and ?_Drawer functions
 // calls I_GetTime, I_StartFrame, and I_StartTic
 
-void NetUpdate(void);
-// create any new ticcmds and broadcast to other players
-
-void D_QuitNetGame(void);
-// broadcasts special packets to other players to notify of game exit
-
-void TryRunTics(void);
-
 //---------
 //SYSTEM IO
 //---------
-
-byte *I_ZoneBase(int *size);
-// called by startup code to get the ammount of memory to malloc
-// for the zone management
-
-// asyncronous interrupt functions should maintain private ques that are
-// read by the syncronous functions to be converted into events
-
-// Copy buffer to video
-
 byte *I_AllocLow(int length);
 // allocates from low memory under dos, just mallocs under unix
 
@@ -823,7 +798,6 @@ void F_StartFinale(void);
 // STATUS BAR (SB_bar.c)
 //----------------------
 
-extern int SB_state;
 void SB_Init(void);
 boolean SB_Responder(event_t * event);
 void SB_Ticker(void);
diff --git a/src/heretic/f_finale.c b/src/heretic/f_finale.c
index 4077bb82..7f6b3594 100644
--- a/src/heretic/f_finale.c
+++ b/src/heretic/f_finale.c
@@ -305,7 +305,6 @@ void F_DemonScroll(void)
 void F_DrawUnderwater(void)
 {
     static boolean underwawa;
-    extern boolean MenuActive;
     extern boolean askforquit;
 
     switch (finalestage)
diff --git a/src/heretic/g_game.c b/src/heretic/g_game.c
index e6c1fd8c..d3331b6e 100644
--- a/src/heretic/g_game.c
+++ b/src/heretic/g_game.c
@@ -52,13 +52,11 @@ boolean G_CheckDemoStatus(void);
 void G_ReadDemoTiccmd(ticcmd_t * cmd);
 void G_WriteDemoTiccmd(ticcmd_t * cmd);
 void G_PlayerReborn(int player);
-void G_InitNew(skill_t skill, int episode, int map);
 
 void G_DoReborn(int playernum);
 
 void G_DoLoadLevel(void);
 void G_DoNewGame(void);
-void G_DoLoadGame(void);
 void G_DoPlayDemo(void);
 void G_DoCompleted(void);
 void G_DoVictory(void);
@@ -708,7 +706,6 @@ static void SetJoyButtons(unsigned int buttons_mask)
 boolean G_Responder(event_t * ev)
 {
     player_t *plr;
-    extern boolean MenuActive;
 
     plr = &players[consoleplayer];
     if (ev->type == ev_keyup && ev->data1 == key_useartifact)
@@ -1071,8 +1068,6 @@ void G_InitPlayer(int player)
 = Can when a player completes a level
 ====================
 */
-extern int curpos;
-extern int inv_ptr;
 extern int playerkeys;
 
 void G_PlayerFinishLevel(int player)
@@ -1508,8 +1503,6 @@ void G_DoNewGame(void)
     gameaction = ga_nothing;
 }
 
-extern int skytexture;
-
 void G_InitNew(skill_t skill, int episode, int map)
 {
     int i;
diff --git a/src/heretic/in_lude.c b/src/heretic/in_lude.c
index 3c382814..e389371f 100644
--- a/src/heretic/in_lude.c
+++ b/src/heretic/in_lude.c
@@ -31,6 +31,7 @@
 
 #include "doomdef.h"
 #include "deh_str.h"
+#include "p_local.h"
 #include "s_sound.h"
 #include "i_system.h"
 #include "i_video.h"
@@ -45,9 +46,6 @@ typedef enum
 
 // Public functions
 
-void IN_Start(void);
-void IN_Ticker(void);
-void IN_Drawer(void);
 
 boolean intermission;
 
diff --git a/src/heretic/mn_menu.c b/src/heretic/mn_menu.c
index 6c7e425d..94713080 100644
--- a/src/heretic/mn_menu.c
+++ b/src/heretic/mn_menu.c
@@ -123,7 +123,6 @@ void MN_LoadSlotText(void);
 
 // External Data
 
-extern int usegamma;
 extern int detailLevel;
 extern int screenblocks;
 
diff --git a/src/heretic/p_user.c b/src/heretic/p_user.c
index 6b2a69fc..79620630 100644
--- a/src/heretic/p_user.c
+++ b/src/heretic/p_user.c
@@ -313,12 +313,12 @@ void P_MovePlayer(player_t * player)
 */
 
 #define         ANG5    (ANG90/18)
+extern int inv_ptr;
+extern int curpos;
 
 void P_DeathThink(player_t * player)
 {
     angle_t angle, delta;
-    extern int inv_ptr;
-    extern int curpos;
     int lookDelta;
 
     P_MovePsprites(player);
@@ -543,8 +543,6 @@ void P_PlayerThink(player_t * player)
     ticcmd_t *cmd;
     weapontype_t newweapon;
 
-    extern boolean ultimatemsg;
-
     // No-clip cheat
     if (player->cheats & CF_NOCLIP)
     {
@@ -812,9 +810,6 @@ void P_ArtiTele(player_t * player)
 
 void P_PlayerNextArtifact(player_t * player)
 {
-    extern int inv_ptr;
-    extern int curpos;
-
     if (player == &players[consoleplayer])
     {
         inv_ptr--;
@@ -851,9 +846,6 @@ void P_PlayerNextArtifact(player_t * player)
 void P_PlayerRemoveArtifact(player_t * player, int slot)
 {
     int i;
-    extern int inv_ptr;
-    extern int curpos;
-
     player->artifactCount--;
     if (!(--player->inventory[slot].count))
     {                           // Used last of a type - compact the artifact list
diff --git a/src/heretic/r_local.h b/src/heretic/r_local.h
index 184b0288..ade120a1 100644
--- a/src/heretic/r_local.h
+++ b/src/heretic/r_local.h
@@ -281,6 +281,7 @@ extern angle_t rw_normalangle;
 // R_main.c
 //
 extern int viewwidth, viewheight, viewwindowx, viewwindowy;
+extern int scaledviewwidth;
 extern int centerx, centery;
 extern int flyheight;
 extern fixed_t centerxfrac;
@@ -391,7 +392,6 @@ extern fixed_t *spritewidth;    // needed for pre rendering (fracs)
 extern fixed_t *spriteoffset;
 extern fixed_t *spritetopoffset;
 extern lighttable_t *colormaps;
-extern int viewwidth, scaledviewwidth, viewheight;
 extern int firstflat;
 extern int numflats;
 
diff --git a/src/heretic/r_things.c b/src/heretic/r_things.c
index e5ff4b4b..353ce7ad 100644
--- a/src/heretic/r_things.c
+++ b/src/heretic/r_things.c
@@ -30,9 +30,6 @@
 #include "i_system.h"
 #include "r_local.h"
 
-void R_DrawColumn(void);
-void R_DrawTLColumn(void);
-
 typedef struct
 {
     int x1, x2;
diff --git a/src/heretic/sb_bar.c b/src/heretic/sb_bar.c
index 51bd3b9c..03ec453d 100644
--- a/src/heretic/sb_bar.c
+++ b/src/heretic/sb_bar.c
@@ -1138,8 +1138,6 @@ static void CheatHealthFunc(player_t * player, Cheat_t * cheat)
 
 static void CheatKeysFunc(player_t * player, Cheat_t * cheat)
 {
-    extern int playerkeys;
-
     player->keys[key_yellow] = true;
     player->keys[key_green] = true;
     player->keys[key_blue] = true;