From 73ca265137d4dbe38865570f3ecdbfe40278b891 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 25 Jul 2015 17:23:17 +0000
Subject: [PATCH] Fix various, but not all warnings.

Except:
 - missing braces around initializer [-Wmissing-braces]: due to union-in-struct
   vec3f_t
 - comparison between signed and unsigned integer expressions [-Wsign-compare]:
   in polymer.c

git-svn-id: https://svn.eduke32.com/eduke32@5309 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/baselayer.c           | 1 +
 polymer/eduke32/build/src/build.c               | 5 ++++-
 polymer/eduke32/build/src/engine.c              | 3 ++-
 polymer/eduke32/source/astub.c                  | 2 +-
 polymer/eduke32/source/jaudiolib/src/multivoc.c | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/polymer/eduke32/build/src/baselayer.c b/polymer/eduke32/build/src/baselayer.c
index c94a7ff64..ef9542802 100644
--- a/polymer/eduke32/build/src/baselayer.c
+++ b/polymer/eduke32/build/src/baselayer.c
@@ -311,6 +311,7 @@ struct glinfo_t glinfo =
     0,          // Occlusion Queries
     0,          // GLSL
     0,          // Debug Output
+    0,          // Buffer storage
     0,          // GL info dumped
 };
 #endif
diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index bb342f62b..5e8c65de5 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -5106,7 +5106,8 @@ end_yax: ;
 
         if (highlightcnt < 0)
         {
-            if (((bstatus & 4) && highlightsectorcnt <= 0) || (bstatus & 4) && linehighlight == -1 || keystatus[0xb8])  //Right alt (sector highlighting)
+            if (((bstatus & 4) && highlightsectorcnt <= 0) || ((bstatus & 4) && linehighlight == -1)
+                || keystatus[0xb8])  //Right alt (sector highlighting)
             {
                 if (highlightsectorcnt == 0)
                 {
@@ -9947,6 +9948,7 @@ static int32_t menuselect(void)
     return -1;
 }
 
+#if 0
 static inline int32_t imod(int32_t a, int32_t b)
 {
     if (a >= 0)
@@ -9954,6 +9956,7 @@ static inline int32_t imod(int32_t a, int32_t b)
 
     return ((a+1)%b)+b-1;
 }
+#endif
 
 int32_t fillsector(int16_t sectnum, int32_t fillcolor)
 {
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 3e9ac540b..d017d28d3 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -17258,7 +17258,8 @@ int32_t getspritecol(int32_t spr)
     int picnum = sprite[spr].picnum;
     int pal = sprite[spr].pal;
 
-    if (palookup[pal] == NULL || tilecols[picnum] && palookup[pal][tilecols[picnum]] == 0) pal = 0;
+    if (palookup[pal] == NULL || (tilecols[picnum] && palookup[pal][tilecols[picnum]] == 0))
+        pal = 0;
 
     if (tilecols[picnum]) return palookup[pal][tilecols[picnum]];
 
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 031546277..92931002d 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -117,7 +117,7 @@ sound_t g_sounds[MAXSOUNDS];
 static int16_t g_definedsndnum[MAXSOUNDS];  // maps parse order index to g_sounds index
 static int16_t g_sndnum[MAXSOUNDS];  // maps current order index to g_sounds index
 int32_t g_numsounds = 0;
-static int32_t lastupdate, mousecol, bstatus;
+static int32_t mousecol, bstatus;
 
 static int32_t corruptchecktimer;
 static int32_t curcorruptthing=-1;
diff --git a/polymer/eduke32/source/jaudiolib/src/multivoc.c b/polymer/eduke32/source/jaudiolib/src/multivoc.c
index 3416978b7..8af140a39 100644
--- a/polymer/eduke32/source/jaudiolib/src/multivoc.c
+++ b/polymer/eduke32/source/jaudiolib/src/multivoc.c
@@ -580,7 +580,7 @@ int32_t MV_SetFrequency(int32_t handle, int32_t frequency)
     return MV_Ok;
 }
 
-static const inline int16_t *MV_GetVolumeTable(int32_t vol) { return MV_VolumeTable[MIX_VOLUME(vol)]; }
+static inline const int16_t *MV_GetVolumeTable(int32_t vol) { return MV_VolumeTable[MIX_VOLUME(vol)]; }
 
 /*---------------------------------------------------------------------
    Function: MV_SetVoiceMixMode