commit f1050ee4fead9f47471f25dc10650dad3bf68220
Author: Fabian Greffrath <fabian@greffrath.com>
AuthorDate: Fri May 8 09:11:23 2015 +0200
Commit: Fabian Greffrath <fabian@greffrath.com>
CommitDate: Fri May 8 09:11:23 2015 +0200
warnings: fix "variable ‘..’ set but not used" warnings
Fixed by commenting out the reported variables and their settings
instead of removing them. Since I am not sure if they were added by
mistake or by purpose and then overseen, I think it's better to keep
them in the code but not compile them in for now.
---
src/i_sdlmusic.c | 4 ++--
src/i_sdlsound.c | 4 ++--
src/strife/f_finale.c | 8 ++++----
src/strife/p_setup.c | 4 ++--
src/strife/st_stuff.c | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 6acb528f..80bc49ab 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -633,7 +633,7 @@ static boolean ReadSubstituteConfig(char *filename)
FILE *fs;
char *error;
int linenum = 1;
- int old_subst_music_len;
+// int old_subst_music_len;
fs = fopen(filename, "r");
@@ -642,7 +642,7 @@ static boolean ReadSubstituteConfig(char *filename)
return false;
}
- old_subst_music_len = subst_music_len;
+// old_subst_music_len = subst_music_len;
while (!feof(fs))
{
diff --git a/src/i_sdlsound.c b/src/i_sdlsound.c
index 7089378e..79a15dbf 100644
--- a/src/i_sdlsound.c
+++ b/src/i_sdlsound.c
@@ -340,7 +340,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
{
SRC_DATA src_data;
uint32_t i, abuf_index=0, clipped=0;
- uint32_t alen;
+// uint32_t alen;
int retn;
int16_t *expanded;
Mix_Chunk *chunk;
@@ -372,7 +372,7 @@ static boolean ExpandSoundData_SRC(sfxinfo_t *sfxinfo,
// Allocate the new chunk.
- alen = src_data.output_frames_gen * 4;
+// alen = src_data.output_frames_gen * 4;
chunk = AllocateSound(sfxinfo, src_data.output_frames_gen * 4);
diff --git a/src/strife/f_finale.c b/src/strife/f_finale.c
index 9c55c102..23ed3dec 100644
--- a/src/strife/f_finale.c
+++ b/src/strife/f_finale.c
@@ -934,11 +934,11 @@ void F_DrawMap34End (void)
{
signed int scrolled;
int x;
- patch_t* p1;
- patch_t* p2;
+// patch_t* p1;
+// patch_t* p2;
- p1 = W_CacheLumpName (DEH_String("credit"), PU_LEVEL);
- p2 = W_CacheLumpName (DEH_String("vellogo"), PU_LEVEL);
+// p1 = W_CacheLumpName (DEH_String("credit"), PU_LEVEL);
+// p2 = W_CacheLumpName (DEH_String("vellogo"), PU_LEVEL);
V_MarkRect (0, 0, SCREENWIDTH, SCREENHEIGHT);
diff --git a/src/strife/p_setup.c b/src/strife/p_setup.c
index 1fd889fa..a8c025d4 100644
--- a/src/strife/p_setup.c
+++ b/src/strife/p_setup.c
@@ -324,7 +324,7 @@ void P_LoadThings (int lump)
mapthing_t *mt;
mapthing_t spawnthing;
int numthings;
- boolean spawn;
+// boolean spawn;
data = W_CacheLumpNum (lump,PU_STATIC);
numthings = W_LumpLength (lump) / sizeof(mapthing_t);
@@ -332,7 +332,7 @@ void P_LoadThings (int lump)
mt = (mapthing_t *)data;
for (i=0 ; i<numthings ; i++, mt++)
{
- spawn = true;
+// spawn = true;
// Do not spawn cool, new monsters if !commercial
// STRIFE-TODO: replace with isregistered stuff
diff --git a/src/strife/st_stuff.c b/src/strife/st_stuff.c
index 59017690..9b055a77 100644
--- a/src/strife/st_stuff.c
+++ b/src/strife/st_stuff.c
@@ -1495,8 +1495,8 @@ void ST_loadGraphics(void)
void ST_loadData(void)
{
- static int dword_8848C = 1; // STRIFE-TODO: what is the purpose of this?
- dword_8848C = 0;
+// static int dword_8848C = 1; // STRIFE-TODO: what is the purpose of this?
+// dword_8848C = 0;
lu_palette = W_GetNumForName (DEH_String("PLAYPAL"));
ST_loadGraphics();