Merge from trunk.

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

13 files changed, 16 insertions, 52 deletions

diff --git a/pkg/osx/disk/dir.DS_Store b/pkg/osx/disk/dir.DS_Store
index b7104637..a2817224 100644
--- a/pkg/osx/disk/dir.DS_Store
+++ b/pkg/osx/disk/dir.DS_Store
diff --git a/src/doom/am_map.c b/src/doom/am_map.c
index 0e7b88e7..31f42df9 100644
--- a/src/doom/am_map.c
+++ b/src/doom/am_map.c
@@ -604,7 +604,6 @@ AM_Responder
 {
 
     int rc;
-    static int cheatstate=0;
     static int bigstate=0;
     static char buffer[20];
     int key;
@@ -701,7 +700,6 @@ AM_Responder
         }
         else
         {
-            cheatstate=0;
             rc = false;
         }
 
diff --git a/src/doom/g_game.c b/src/doom/g_game.c
index f4b64271..554fe542 100644
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -1010,16 +1010,10 @@ void G_Ticker (void)
 // 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); 
-	 
-} 
+}
  
  
 
diff --git a/src/doom/hu_lib.c b/src/doom/hu_lib.c
index c7c62d06..0feff7d7 100644
--- a/src/doom/hu_lib.c
+++ b/src/doom/hu_lib.c
@@ -147,7 +147,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
@@ -170,7 +169,6 @@ void HUlib_eraseTextLine(hu_textline_t* l)
 	}
     }
 
-    lastautomapactive = automapactive;
     if (l->needsupdate) l->needsupdate--;
 
 }
diff --git a/src/doom/m_menu.c b/src/doom/m_menu.c
index b0eeee06..d10a0622 100644
--- a/src/doom/m_menu.c
+++ b/src/doom/m_menu.c
@@ -510,10 +510,9 @@ menu_t  SaveDef =
 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));
@@ -525,7 +524,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/doom/p_doors.c b/src/doom/p_doors.c
index 89b65328..6a0bea3a 100644
--- a/src/doom/p_doors.c
+++ b/src/doom/p_doors.c
@@ -347,7 +347,6 @@ EV_VerticalDoor
   mobj_t*	thing )
 {
     player_t*	player;
-    int		secnum;
     sector_t*	sec;
     vldoor_t*	door;
     int		side;
@@ -402,7 +401,6 @@ EV_VerticalDoor
 	
     // 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/doom/p_enemy.c b/src/doom/p_enemy.c
index 10846d20..66321e2c 100644
--- a/src/doom/p_enemy.c
+++ b/src/doom/p_enemy.c
@@ -504,12 +504,9 @@ P_LookForPlayers
     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;
 	
diff --git a/src/doom/p_spec.c b/src/doom/p_spec.c
index 68f986dc..c4d2ffc8 100644
--- a/src/doom/p_spec.c
+++ b/src/doom/p_spec.c
@@ -1383,11 +1383,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/doom/r_data.c b/src/doom/r_data.c
index 505f1ff7..13c9eb98 100644
--- a/src/doom/r_data.c
+++ b/src/doom/r_data.c
@@ -199,10 +199,7 @@ R_DrawColumnInCache
     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_InitSpriteLumps (void)
 //
 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);
 }
 
diff --git a/src/doom/s_sound.c b/src/doom/s_sound.c
index 7f4411dd..12a55d8f 100644
--- a/src/doom/s_sound.c
+++ b/src/doom/s_sound.c
@@ -404,7 +404,6 @@ void S_StartSound(void *origin_p, int sfx_id)
     mobj_t *origin;
     int rc;
     int sep;
-    int priority;
     int cnum;
     int volume;
 
@@ -422,7 +421,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)
@@ -434,10 +432,6 @@ void S_StartSound(void *origin_p, int sfx_id)
         {
             volume = snd_SfxVolume;
         }
-    }        
-    else
-    {
-        priority = NORM_PRIORITY;
     }
 
 
diff --git a/src/doom/wi_stuff.c b/src/doom/wi_stuff.c
index 45c09343..298dc07d 100644
--- a/src/doom/wi_stuff.c
+++ b/src/doom/wi_stuff.c
@@ -1013,10 +1013,6 @@ void WI_drawDeathmatchStats(void)
     int		x;
     int		y;
     int		w;
-    
-    int		lh;	// line height
-
-    lh = WI_SPACINGY;
 
     WI_slamBackground();
     
diff --git a/src/i_video.c b/src/i_video.c
index 6b850941..bf8ab77b 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1342,7 +1342,7 @@ static boolean AutoAdjustFullscreen(void)
     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);
@@ -1359,9 +1359,8 @@ static boolean AutoAdjustFullscreen(void)
 
     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);
 
diff --git a/textscreen/txt_largefont.h b/textscreen/txt_largefont.h
index 874cd61d..961185c8 100644
--- a/textscreen/txt_largefont.h
+++ b/textscreen/txt_largefont.h
@@ -601,11 +601,11 @@ static uint8_t large_font_data[] =
 
     // 57:
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x3f, 0xf0, 0x7f, 0xf8, 0xf0, 0x3c, 0xe0, 0x1c,
-    0xe0, 0x1c, 0xe0, 0x1c, 0xe0, 0x1c, 0xf0, 0x3c,
-    0x7f, 0xfc, 0x3f, 0xfc, 0x00, 0x1c, 0x00, 0x1c,
-    0x00, 0x1c, 0x00, 0x3c, 0x00, 0x38, 0x00, 0x78,
-    0x00, 0xf0, 0x03, 0xe0, 0x3f, 0xc0, 0x3f, 0x00,
+    0x3f, 0xf0, 0x7f, 0xf8, 0xf0, 0x3c, 0xf0, 0x3c,
+    0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c, 0xf0, 0x3c,
+    0x7f, 0xfc, 0x3f, 0xfc, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c, 0x00, 0x3c,
+    0x00, 0x78, 0x00, 0xf0, 0x3f, 0xe0, 0x3f, 0xc0,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,