diff options
author | Simon Howard | 2011-10-29 22:58:13 +0000 |
---|---|---|
committer | Simon Howard | 2011-10-29 22:58:13 +0000 |
commit | 4bf764a5b8952856b1ca04f1282121e8054938de (patch) | |
tree | 1a5992de07f5b5377854dd3a0aab42ff7c81db10 /src/strife | |
parent | cfbdd3d79d1e3cc48165536cb7b4166b94f77e9b (diff) | |
download | chocolate-doom-4bf764a5b8952856b1ca04f1282121e8054938de.tar.gz chocolate-doom-4bf764a5b8952856b1ca04f1282121e8054938de.tar.bz2 chocolate-doom-4bf764a5b8952856b1ca04f1282121e8054938de.zip |
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
Diffstat (limited to 'src/strife')
-rw-r--r-- | src/strife/am_map.c | 8 | ||||
-rw-r--r-- | src/strife/d_main.c | 4 | ||||
-rw-r--r-- | src/strife/d_net.c | 2 | ||||
-rw-r--r-- | src/strife/doomstat.h | 10 | ||||
-rw-r--r-- | src/strife/f_finale.c | 2 | ||||
-rw-r--r-- | src/strife/f_wipe.c | 2 | ||||
-rw-r--r-- | src/strife/g_game.c | 8 | ||||
-rw-r--r-- | src/strife/hu_stuff.c | 1 | ||||
-rw-r--r-- | src/strife/m_menu.c | 4 | ||||
-rw-r--r-- | src/strife/p_user.c | 1 | ||||
-rw-r--r-- | src/strife/r_draw.c | 11 | ||||
-rw-r--r-- | src/strife/r_main.h | 2 | ||||
-rw-r--r-- | src/strife/st_stuff.h | 1 |
13 files changed, 0 insertions, 56 deletions
diff --git a/src/strife/am_map.c b/src/strife/am_map.c index 45b46c9b..2e13d28f 100644 --- a/src/strife/am_map.c +++ b/src/strife/am_map.c @@ -251,14 +251,6 @@ cheatseq_t cheat_amap = CHEAT("topo", 0); // villsa [STRIFE] static boolean stopped = true; -extern boolean viewactive; - -void -V_MarkRect -( int x, - int y, - int width, - int height ); // Calculates the slope and slope according to the x-axis of a line // segment in map coordinates (with the upright y-axis n' all) so diff --git a/src/strife/d_main.c b/src/strife/d_main.c index 08274636..89f99648 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -165,8 +165,6 @@ static int comport = 0; static char *nickname = NULL; void D_CheckNetGame (void); -void D_ProcessEvents (void); -void D_DoAdvanceDemo (void); // @@ -490,8 +488,6 @@ boolean D_GrabMouseCallback(void) // // haleyjd 08/23/10: [STRIFE] Verified unmodified. // -extern boolean demorecording; - void D_DoomLoop (void) { if (demorecording) diff --git a/src/strife/d_net.c b/src/strife/d_net.c index a8d91136..656d1393 100644 --- a/src/strife/d_net.c +++ b/src/strife/d_net.c @@ -253,8 +253,6 @@ void D_InitSinglePlayerGame(net_gamesettings_t *settings) // D_CheckNetGame // Works out player numbers among the net participants // -extern int viewangleoffset; - void D_CheckNetGame (void) { net_connect_data_t connect_data; diff --git a/src/strife/doomstat.h b/src/strife/doomstat.h index 05c2d0ee..1d2d191d 100644 --- a/src/strife/doomstat.h +++ b/src/strife/doomstat.h @@ -151,12 +151,6 @@ extern boolean viewactive; extern boolean nodrawers; -extern int viewwindowx; -extern int viewwindowy; -extern int viewheight; -extern int viewwidth; -extern int scaledviewwidth; - extern boolean testcontrols; extern int testcontrols_mousespeed; @@ -247,10 +241,6 @@ extern mapthing_t riftSpots[MAXRIFTSPOTS]; extern wbstartstruct_t wminfo; -// LUT of ammunition limits for each kind. -// This doubles with BackPack powerup item. -extern int maxammo[NUMAMMO]; - diff --git a/src/strife/f_finale.c b/src/strife/f_finale.c index 551a4e24..b853c601 100644 --- a/src/strife/f_finale.c +++ b/src/strife/f_finale.c @@ -608,8 +608,6 @@ int castframes; int castonmelee; boolean castattacking; -extern gamestate_t wipegamestate; - // // F_StartCast // diff --git a/src/strife/f_wipe.c b/src/strife/f_wipe.c index 8c3eeaae..2d2ac3bd 100644 --- a/src/strife/f_wipe.c +++ b/src/strife/f_wipe.c @@ -271,8 +271,6 @@ wipe_ScreenWipe wipe_initMelt, wipe_doMelt, wipe_exitMelt }; - void V_MarkRect(int, int, int, int); - // initial stuff if (!go) { diff --git a/src/strife/g_game.c b/src/strife/g_game.c index 18f037c2..f76ce747 100644 --- a/src/strife/g_game.c +++ b/src/strife/g_game.c @@ -77,17 +77,14 @@ #define SAVEGAMESIZE 0x2c000 -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 map); void G_DoReborn (int playernum); void G_DoLoadLevel (void); void G_DoNewGame (void); -void G_DoLoadGame (boolean userload); void G_DoPlayDemo (void); void G_DoCompleted (void); void G_DoVictory (void); @@ -669,8 +666,6 @@ void G_BuildTiccmd (ticcmd_t* cmd, int maketic) // // G_DoLoadLevel // -extern gamestate_t wipegamestate; - void G_DoLoadLevel (void) { int i; @@ -1921,9 +1916,6 @@ void G_DoNewGame (void) gameaction = ga_nothing; } -// The sky texture to be used instead of the F_SKY1 dummy. -extern int skytexture; - // // G_InitNew // diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c index 83757b07..ab973e8d 100644 --- a/src/strife/hu_stuff.c +++ b/src/strife/hu_stuff.c @@ -118,7 +118,6 @@ static hu_stext_t w_message; static int message_counter; //extern int showMessages; [STRIFE] no such variable -extern boolean automapactive; static boolean headsupactive = false; diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c index 2fa63abc..10b9854e 100644 --- a/src/strife/m_menu.c +++ b/src/strife/m_menu.c @@ -174,7 +174,6 @@ void M_EndGame(int choice); void M_ReadThis(int choice); void M_ReadThis2(int choice); void M_ReadThis3(int choice); // [STRIFE] -void M_QuitStrife(int choice); //void M_ChangeMessages(int choice); [STRIFE] void M_ChangeSensitivity(int choice); @@ -186,7 +185,6 @@ void M_StartGame(int choice); void M_Sound(int choice); //void M_FinishReadThis(int choice); - [STRIFE] unused -void M_LoadSelect(int choice); void M_SaveSelect(int choice); void M_ReadSaveStrings(void); void M_QuickSave(void); @@ -210,10 +208,8 @@ void M_DrawEmptyCell(menu_t *menu,int item); void M_DrawSelCell(menu_t *menu,int item); int M_StringWidth(char *string); int M_StringHeight(char *string); -void M_StartControlPanel(void); void M_StartMessage(char *string,void *routine,boolean input); void M_StopMessage(void); -void M_ClearMenus (int choice); diff --git a/src/strife/p_user.c b/src/strife/p_user.c index af03e81f..aa2ba430 100644 --- a/src/strife/p_user.c +++ b/src/strife/p_user.c @@ -52,7 +52,6 @@ #define LOOKDOWNMAX -110 // villsa [STRIFE] -boolean P_UseInventoryItem(player_t* player, int item); // fraggle [STRIFE] void P_DropInventoryItem(player_t* player, int sprite); // villsa [STRIFE] boolean P_ItemBehavior(player_t* player, int item); // villsa [STRIFE] static char useinventorymsg[44]; // villsa [STRIFE] diff --git a/src/strife/r_draw.c b/src/strife/r_draw.c index 61226b15..27c44763 100644 --- a/src/strife/r_draw.c +++ b/src/strife/r_draw.c @@ -433,10 +433,6 @@ void R_DrawTRTLColumn(void) } -// haleyjd 08/26/10: [STRIFE] - Rogue's translucency lookup table -// This is functionally equivalent to Raven's TINTTAB and BOOM's TRANMAPs. -extern byte *xlatab; - // // R_InitTranslationTables // Creates the translation tables to map @@ -943,13 +939,6 @@ R_VideoErase // Draws the border around the view // for different size windows? // -void -V_MarkRect -( int x, - int y, - int width, - int height ); - void R_DrawViewBorder (void) { int top; diff --git a/src/strife/r_main.h b/src/strife/r_main.h index edc5dbbb..5cb858bb 100644 --- a/src/strife/r_main.h +++ b/src/strife/r_main.h @@ -40,8 +40,6 @@ extern fixed_t viewcos; extern fixed_t viewsin; -extern int viewwidth; -extern int viewheight; extern int viewwindowx; extern int viewwindowy; diff --git a/src/strife/st_stuff.h b/src/strife/st_stuff.h index 34b1146d..2bf3bbd4 100644 --- a/src/strife/st_stuff.h +++ b/src/strife/st_stuff.h @@ -85,7 +85,6 @@ typedef enum } st_chatstateenum_t; -boolean ST_Responder(event_t* ev); extern byte *st_backing_screen; |