shithub: choc

Info  •  Files  •  Log  •  Branches

Fix compiler warnings caused by unused variables.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2552

--- a/src/am_map.c

+++ b/src/am_map.c

@@ -628,7 +628,6 @@

 {

     int rc;

-    static int cheatstate=0;

     static int bigstate=0;

     static char buffer[20];

     int key;

@@ -725,7 +724,6 @@

         }

         else

         {

-            cheatstate=0;

             rc = false;

         }

--- a/src/g_game.c

+++ b/src/g_game.c

@@ -1195,16 +1195,10 @@

 // Called by the game initialization functions.

 //

 void G_InitPlayer (int player) 

-{ 

-    player_t*	p; 

- 

-    // set up the saved info         

-    p = &players[player]; 

-	 

-    // clear everything else to defaults 

+{

+    // clear everything else to defaults

     G_PlayerReborn (player); 

-	 

-} 

+}

--- a/src/hu_lib.c

+++ b/src/hu_lib.c

@@ -146,7 +146,6 @@

     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

@@ -169,7 +168,6 @@

 	}

     }

-    lastautomapactive = automapactive;

     if (l->needsupdate) l->needsupdate--;

 }

--- a/src/i_video.c

+++ b/src/i_video.c

@@ -1133,7 +1133,7 @@

     SDL_Rect **modes;

     SDL_Rect *best_mode;

     screen_mode_t *screen_mode;

-    int target_pixels, diff, best_diff;

+    int diff, best_diff;

     int i;

     modes = SDL_ListModes(NULL, SDL_FULLSCREEN);

@@ -1150,9 +1150,8 @@

     best_mode = NULL;

     best_diff = INT_MAX;

-    target_pixels = screen_width * screen_height;

-    for (i=0; modes[i] != NULL; ++i) 

+    for (i=0; modes[i] != NULL; ++i)

     {

         //printf("%ix%i?\n", modes[i]->w, modes[i]->h);

--- a/src/m_menu.c

+++ b/src/m_menu.c

@@ -540,10 +540,9 @@

 void M_ReadSaveStrings(void)

 {

     FILE   *handle;

-    int     count;

     int     i;

     char    name[256];

-	

+

     for (i = 0;i < load_end;i++)

     {

         strcpy(name, P_SaveGameFile(i));

@@ -555,7 +554,7 @@

 	    LoadMenu[i].status = 0;

 	    continue;

 	}

-	count = fread(&savegamestrings[i], 1, SAVESTRINGSIZE, handle);

+	fread(&savegamestrings[i], 1, SAVESTRINGSIZE, handle);

 	fclose(handle);

 	LoadMenu[i].status = 1;

     }

--- a/src/p_doors.c

+++ b/src/p_doors.c

@@ -347,7 +347,6 @@

   mobj_t*	thing )

 {

     player_t*	player;

-    int		secnum;

     sector_t*	sec;

     vldoor_t*	door;

     int		side;

@@ -402,7 +401,6 @@

     // if the sector has an active thinker, use it

     sec = sides[ line->sidenum[side^1]] .sector;

-    secnum = sec-sectors;

     if (sec->specialdata)

     {

--- a/src/p_enemy.c

+++ b/src/p_enemy.c

@@ -504,12 +504,9 @@

     int		c;

     int		stop;

     player_t*	player;

-    sector_t*	sector;

     angle_t	an;

     fixed_t	dist;

-		

-    sector = actor->subsector->sector;

-	

+

     c = 0;

     stop = (actor->lastlook-1)&3;

--- a/src/p_spec.c

+++ b/src/p_spec.c

@@ -1383,11 +1383,6 @@

 {

     sector_t*	sector;

     int		i;

-    int		episode;

-

-    episode = 1;

-    if (W_CheckNumForName(DEH_String("texture2")) >= 0)

-	episode = 2;

     // See if -TIMER was specified.

--- a/src/r_data.c

+++ b/src/r_data.c

@@ -199,10 +199,7 @@

     int		count;

     int		position;

     byte*	source;

-    byte*	dest;

-	

-    dest = (byte *)cache + 3;

-	

+

     while (patch->topdelta != 0xff)

     {

 	source = (byte *)patch + 3;

@@ -694,12 +691,11 @@

 //

 void R_InitColormaps (void)

 {

-    int	lump, length;

-    

+    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);

 }

--- a/src/s_sound.c

+++ b/src/s_sound.c

@@ -562,7 +562,6 @@

     mobj_t *origin;

     int rc;

     int sep;

-    int priority;

     int cnum;

     int volume;

@@ -580,7 +579,6 @@

     // Initialize sound parameters

     if (sfx->link)

     {

-        priority = sfx->priority;

         volume += sfx->volume;

         if (volume < 1)

@@ -592,10 +590,6 @@

         {

             volume = snd_SfxVolume;

         }

-    }        

-    else

-    {

-        priority = NORM_PRIORITY;

     }

--- a/src/wi_stuff.c

+++ b/src/wi_stuff.c

@@ -1014,10 +1014,6 @@

     int		x;

     int		y;

     int		w;

-    

-    int		lh;	// line height

-

-    lh = WI_SPACINGY;

     WI_slamBackground();