commit adbfa3216cf3ef6f71cc5b6b22c25a04ae737212
Author: Simon Howard <fraggle@gmail.com>
AuthorDate: Sun Dec 23 21:25:40 2012 +0000
Commit: Simon Howard <fraggle@gmail.com>
CommitDate: Sun Dec 23 21:25:40 2012 +0000
Fix compiler warnings caused by unused variables.
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 2552
---
src/am_map.c | 2 --
src/g_game.c | 12 +++---------
src/hu_lib.c | 2 --
src/i_video.c | 5 ++---
src/m_menu.c | 5 ++---
src/p_doors.c | 2 --
src/p_enemy.c | 5 +----
src/p_spec.c | 5 -----
src/r_data.c | 10 +++-------
src/s_sound.c | 6 ------
src/wi_stuff.c | 4 ----
11 files changed, 11 insertions(+), 47 deletions(-)
diff --git a/src/am_map.c b/src/am_map.c
index 4c58abdd..aa6cae05 100644
--- a/src/am_map.c
+++ b/src/am_map.c
@@ -628,7 +628,6 @@ AM_Responder
{
int rc;
- static int cheatstate=0;
static int bigstate=0;
static char buffer[20];
int key;
@@ -725,7 +724,6 @@ AM_Responder
}
else
{
- cheatstate=0;
rc = false;
}
diff --git a/src/g_game.c b/src/g_game.c
index c68f40ad..fe168fae 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1195,16 +1195,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/hu_lib.c b/src/hu_lib.c
index a6b00f3f..32c13b98 100644
--- a/src/hu_lib.c
+++ b/src/hu_lib.c
@@ -146,7 +146,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
@@ -169,7 +168,6 @@ void HUlib_eraseTextLine(hu_textline_t* l)
}
}
- lastautomapactive = automapactive;
if (l->needsupdate) l->needsupdate--;
}
diff --git a/src/i_video.c b/src/i_video.c
index 5c5d50aa..fdde7766 100644
--- a/src/i_video.c
+++ b/src/i_video.c
@@ -1133,7 +1133,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);
@@ -1150,9 +1150,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/src/m_menu.c b/src/m_menu.c
index cd2634a2..5c30f2bc 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -540,10 +540,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));
@@ -555,7 +554,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/p_doors.c b/src/p_doors.c
index 89b65328..6a0bea3a 100644
--- a/src/p_doors.c
+++ b/src/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/p_enemy.c b/src/p_enemy.c
index 760bbbc8..9b1d8e37 100644
--- a/src/p_enemy.c
+++ b/src/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/p_spec.c b/src/p_spec.c
index 68f986dc..c4d2ffc8 100644
--- a/src/p_spec.c
+++ b/src/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/r_data.c b/src/r_data.c
index ccfc5efe..a9f8920c 100644
--- a/src/r_data.c
+++ b/src/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/s_sound.c b/src/s_sound.c
index 7ae7559a..27a47443 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -562,7 +562,6 @@ void S_StartSound(void *origin_p, int sfx_id)
mobj_t *origin;
int rc;
int sep;
- int priority;
int cnum;
int volume;
@@ -580,7 +579,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)
@@ -592,10 +590,6 @@ void S_StartSound(void *origin_p, int sfx_id)
{
volume = snd_SfxVolume;
}
- }
- else
- {
- priority = NORM_PRIORITY;
}
diff --git a/src/wi_stuff.c b/src/wi_stuff.c
index 7c0ba312..37933eda 100644
--- a/src/wi_stuff.c
+++ b/src/wi_stuff.c
@@ -1014,10 +1014,6 @@ void WI_drawDeathmatchStats(void)
int x;
int y;
int w;
-
- int lh; // line height
-
- lh = WI_SPACINGY;
WI_slamBackground();