Merge branch 'master' of github.com:chocolate-doom/chocolate-doom

10 files changed, 20 insertions, 21 deletions

diff --git a/src/heretic/p_enemy.c b/src/heretic/p_enemy.c
index b4222ec8..55608c54 100644
--- a/src/heretic/p_enemy.c
+++ b/src/heretic/p_enemy.c
@@ -1904,7 +1904,7 @@ void A_WhirlwindSeek(mobj_t * actor)
 
 void A_HeadIceImpact(mobj_t * ice)
 {
-    int i;
+    unsigned int i;
     angle_t angle;
     mobj_t *shard;
 
@@ -2519,7 +2519,7 @@ void A_VolcanoBlast(mobj_t * volcano)
 
 void A_VolcBallImpact(mobj_t * ball)
 {
-    int i;
+    unsigned int i;
     mobj_t *tiny;
     angle_t angle;
 
diff --git a/src/heretic/p_pspr.c b/src/heretic/p_pspr.c
index 2cbe3674..813dd6a2 100644
--- a/src/heretic/p_pspr.c
+++ b/src/heretic/p_pspr.c
@@ -1330,7 +1330,7 @@ void A_DeathBallImpact(mobj_t * ball)
 
 void A_SpawnRippers(mobj_t * actor)
 {
-    int i;
+    unsigned int i;
     angle_t angle;
     mobj_t *ripper;
 
diff --git a/src/hexen/p_enemy.c b/src/hexen/p_enemy.c
index dc2c9fe5..38f3a2b5 100644
--- a/src/hexen/p_enemy.c
+++ b/src/hexen/p_enemy.c
@@ -3855,7 +3855,7 @@ void A_IceGuyDie(mobj_t * actor)
 void A_IceGuyMissileExplode(mobj_t * actor)
 {
     mobj_t *mo;
-    int i;
+    unsigned int i;
 
     for (i = 0; i < 8; i++)
     {
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/midifile.c b/src/midifile.c
index 92ffd803..1ab4ecdb 100644
--- a/src/midifile.c
+++ b/src/midifile.c
@@ -130,7 +130,7 @@ static boolean ReadByte(byte *result, FILE *stream)
 static boolean ReadVariableLength(unsigned int *result, FILE *stream)
 {
     int i;
-    byte b;
+    byte b = 0;
 
     *result = 0;
 
@@ -203,7 +203,7 @@ static boolean ReadChannelEvent(midi_event_t *event,
                                 byte event_type, boolean two_param,
                                 FILE *stream)
 {
-    byte b;
+    byte b = 0;
 
     // Set basics:
 
@@ -269,7 +269,7 @@ static boolean ReadSysExEvent(midi_event_t *event, int event_type,
 
 static boolean ReadMetaEvent(midi_event_t *event, FILE *stream)
 {
-    byte b;
+    byte b = 0;
 
     event->event_type = MIDI_EVENT_META;
 
@@ -308,7 +308,7 @@ static boolean ReadMetaEvent(midi_event_t *event, FILE *stream)
 static boolean ReadEvent(midi_event_t *event, unsigned int *last_event_type,
                          FILE *stream)
 {
-    byte event_type;
+    byte event_type = 0;
 
     if (!ReadVariableLength(&event->delta_time, stream))
     {
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/g_game.c b/src/strife/g_game.c
index e0c0ae27..906d3c99 100644
--- a/src/strife/g_game.c
+++ b/src/strife/g_game.c
@@ -984,7 +984,6 @@ void G_Ticker (void)
                 && turbodetected[i])
             {
                 static char turbomessage[80];
-                extern char player_names[8][16];
                 M_snprintf(turbomessage, sizeof(turbomessage),
                            "%s is turbo!", player_names[i]);
                 players[consoleplayer].message = turbomessage;
diff --git a/src/strife/p_setup.c b/src/strife/p_setup.c
index fe1140bd..ad65f20e 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();