Fix compiler warnings by removing variables that are set but not used.

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

11 files changed, 7 insertions, 41 deletions

diff --git a/src/strife/am_map.c b/src/strife/am_map.c
index 2e13d28f..e942e3ac 100644
--- a/src/strife/am_map.c
+++ b/src/strife/am_map.c
@@ -540,7 +540,8 @@ void AM_Stop (void)
 //
 void AM_Start (void)
 {
-    static int lastlevel = -1, lastepisode = -1;
+    static int lastlevel = -1;
+    //static int lastepisode = -1;
 
     if (!stopped) AM_Stop();
     stopped = false;
@@ -584,7 +585,6 @@ AM_Responder
 {
 
     int rc;
-    static int cheatstate=0;
     static int bigstate=0;
     static char buffer[20];
     int key;
@@ -681,7 +681,6 @@ AM_Responder
         }
         else
         {
-            cheatstate=0;
             rc = false;
         }
 
diff --git a/src/strife/f_finale.c b/src/strife/f_finale.c
index b853c601..ea11c81a 100644
--- a/src/strife/f_finale.c
+++ b/src/strife/f_finale.c
@@ -909,7 +909,6 @@ void F_DrawMap34End (void)
     int         x;
     patch_t*    p1;
     patch_t*    p2;
-    static int  laststage;
 
     p1 = W_CacheLumpName (DEH_String("credit"),  PU_LEVEL);
     p2 = W_CacheLumpName (DEH_String("vellogo"), PU_LEVEL);
diff --git a/src/strife/hu_lib.c b/src/strife/hu_lib.c
index 6d29115b..38ab644a 100644
--- a/src/strife/hu_lib.c
+++ b/src/strife/hu_lib.c
@@ -236,7 +236,6 @@ void HUlib_eraseTextLine(hu_textline_t* l)
     int                 lh;
     int                 y;
     int                 yoffset;
-    static boolean      lastautomapactive = true;
 
     // Only erases when NOT in automap and the screen is reduced,
     // and the text must either need updating or refreshing
@@ -259,7 +258,6 @@ void HUlib_eraseTextLine(hu_textline_t* l)
         }
     }
 
-    lastautomapactive = automapactive;
     if (l->needsupdate) l->needsupdate--;
 }
 
diff --git a/src/strife/hu_stuff.c b/src/strife/hu_stuff.c
index d01b8bfa..eae9d166 100644
--- a/src/strife/hu_stuff.c
+++ b/src/strife/hu_stuff.c
@@ -540,7 +540,6 @@ boolean HU_Responder(event_t *ev)
     static char         lastmessage[HU_MAXLINELENGTH+1];
     char*               macromessage;
     boolean             eatkey = false;
-    static boolean      shiftdown = false;
     static boolean      altdown = false;
     unsigned char       c;
     int                 i;
@@ -554,7 +553,6 @@ boolean HU_Responder(event_t *ev)
 
     if (ev->data1 == KEY_RSHIFT)
     {
-        shiftdown = ev->type == ev_keydown;
         return false;
     }
     else if (ev->data1 == KEY_RALT || ev->data1 == KEY_LALT)
diff --git a/src/strife/m_menu.c b/src/strife/m_menu.c
index 10b9854e..82158e2f 100644
--- a/src/strife/m_menu.c
+++ b/src/strife/m_menu.c
@@ -542,7 +542,6 @@ menu_t NameCharDef =
 void M_ReadSaveStrings(void)
 {
     FILE *handle;
-    int   count;
     int   i;
     char *fname = NULL;
 
@@ -559,7 +558,7 @@ void M_ReadSaveStrings(void)
             LoadMenu[i].status = 0;
             continue;
         }
-        count = fread(savegamestrings[i], 1, SAVESTRINGSIZE, handle);
+        fread(savegamestrings[i], 1, SAVESTRINGSIZE, handle);
         fclose(handle);
         LoadMenu[i].status = 1;
     }
diff --git a/src/strife/p_dialog.c b/src/strife/p_dialog.c
index ecb11d25..e1df1097 100644
--- a/src/strife/p_dialog.c
+++ b/src/strife/p_dialog.c
@@ -700,7 +700,6 @@ boolean P_GiveItemToPlayer(player_t *player, int sprnum, mobjtype_t type)
 {

     int i = 0;

     line_t junk;

-    boolean ok = true;

     int sound = sfx_itemup; // haleyjd 09/21/10: different sounds for items

 

     // set quest if mf_givequest flag is set

@@ -1262,7 +1261,6 @@ void P_DialogStartP1(void)
 void P_DialogStart(player_t *player)

 {

     int i = 0;

-    int j = 0;

     int pic;

     int rnd = 0;

     char* byetext;

diff --git a/src/strife/p_doors.c b/src/strife/p_doors.c
index 850baac6..e85d9d7d 100644
--- a/src/strife/p_doors.c
+++ b/src/strife/p_doors.c
@@ -504,19 +504,16 @@ int EV_DoDoor(line_t* line, vldoor_e type)
 boolean EV_ClearForceFields(line_t* line)
 {
     int         secnum;
-    int         rtn;
     sector_t*   sec;
     int         i;
     line_t*     secline;
     boolean     ret = false;
 
     secnum = -1;
-    rtn = 0;
 
     while((secnum = P_FindSectorFromLineTag(line,secnum)) >= 0)
     {
         sec = &sectors[secnum];
-        rtn = 1;
 
         line->special = 0;
         ret = true;
@@ -549,7 +546,6 @@ boolean EV_ClearForceFields(line_t* line)
 void EV_VerticalDoor(line_t* line, mobj_t* thing)
 {
     player_t*   player;
-    int         secnum;
     sector_t*   sec;
     vldoor_t*   door;
     int         side;
@@ -730,7 +726,6 @@ void EV_VerticalDoor(line_t* line, mobj_t* thing)
 
     // if the sector has an active thinker, use it
     sec = sides[ line->sidenum[side^1]] .sector;
-    secnum = sec-sectors;
 
     if (sec->specialdata)
     {
diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c
index c7104a75..684d6b27 100644
--- a/src/strife/p_enemy.c
+++ b/src/strife/p_enemy.c
@@ -741,7 +741,6 @@ P_LookForPlayers
     int         c;
     int         stop;
     player_t*   player;
-    sector_t*   sector;
     angle_t     an;
     fixed_t     dist;
     mobj_t  *   master = players[actor->miscdata].mo;
@@ -800,8 +799,6 @@ P_LookForPlayers
         return true;
     }
 
-    sector = actor->subsector->sector;
-
     c = 0;
 
     // NOTE: This behavior has been changed from the Vanilla behavior, where
diff --git a/src/strife/p_spec.c b/src/strife/p_spec.c
index e59a5b05..10a778bb 100644
--- a/src/strife/p_spec.c
+++ b/src/strife/p_spec.c
@@ -261,7 +261,6 @@ terraintype_e P_GetTerrainType(mobj_t* mobj)
 
 void P_InitTerrainTypes(void)
 {
-    int pic = 0;
     int i = 0;
 
     if(terraintypes[0].type != FLOOR_END)
@@ -1887,11 +1886,6 @@ void P_SpawnSpecials (void)
 {
     sector_t*   sector;
     int         i;
-    int         episode;
-
-    episode = 1;
-    if (W_CheckNumForName(DEH_String("texture2")) >= 0)
-        episode = 2;
 
     // See if -TIMER was specified.
 
diff --git a/src/strife/r_data.c b/src/strife/r_data.c
index 9130d6d7..b8fa5686 100644
--- a/src/strife/r_data.c
+++ b/src/strife/r_data.c
@@ -195,10 +195,7 @@ R_DrawColumnInCache
     int		count;
     int		position;
     byte*	source;
-    byte*	dest;
-	
-    dest = (byte *)cache + 3;
-	
+
     while (patch->topdelta != 0xff)
     {
 	source = (byte *)patch + 3;
@@ -708,12 +705,10 @@ void R_InitSpriteLumps (void)
 //
 void R_InitColormaps (void)
 {
-    int	lump, length;
-    
-    // Load in the light tables, 
-    //  256 byte align tables.
+    int	lump;
+
+    // Load in the light tables, 256 byte align tables.
     lump = W_GetNumForName(DEH_String("COLORMAP"));
-    length = W_LumpLength (lump);
     colormaps = W_CacheLumpNum(lump, PU_STATIC);
 }
 
diff --git a/src/strife/s_sound.c b/src/strife/s_sound.c
index 6318c205..ec59f3a6 100644
--- a/src/strife/s_sound.c
+++ b/src/strife/s_sound.c
@@ -412,7 +412,6 @@ void S_StartSound(void *origin_p, int sfx_id)
     mobj_t *origin;
     int rc;
     int sep;
-    int priority;
     int cnum;
     int volume;
 
@@ -434,7 +433,6 @@ void S_StartSound(void *origin_p, int sfx_id)
     // Initialize sound parameters
     if (sfx->link)
     {
-        priority = sfx->priority;
         volume += sfx->volume;
 
         if (volume < 1)
@@ -446,10 +444,6 @@ void S_StartSound(void *origin_p, int sfx_id)
         {
             volume = snd_SfxVolume;
         }
-    }        
-    else
-    {
-        priority = NORM_PRIORITY;
     }