5 files changed, 22 insertions, 15 deletions

diff --git a/apps/plugins/sdl/progs/quake/cl_input.c b/apps/plugins/sdl/progs/quake/cl_input.c
index 5327b7363e..613ca431b9 100644
--- a/apps/plugins/sdl/progs/quake/cl_input.c
+++ b/apps/plugins/sdl/progs/quake/cl_input.c
@@ -172,35 +172,36 @@ float CL_KeyState (kbutton_t *key)
 {
         float           val;
         qboolean        impulsedown, impulseup, down;
-        
+
         impulsedown = key->state & 2;
         impulseup = key->state & 4;
         down = key->state & 1;
         val = 0;
-        
-        if (impulsedown && !impulseup)
+
+        if (impulsedown && !impulseup) {
                 if (down)
                         val = 0.5;      // pressed and held this frame
                 else
                         val = 0;        //      I_Error ();
-        if (impulseup && !impulsedown)
+        } else if (impulseup && !impulsedown) {
                 if (down)
                         val = 0;        //      I_Error ();
                 else
                         val = 0;        // released this frame
-        if (!impulsedown && !impulseup)
+        } else if (!impulsedown && !impulseup) {
                 if (down)
                         val = 1.0;      // held the entire frame
                 else
                         val = 0;        // up the entire frame
-        if (impulsedown && impulseup)
+        } else if (impulsedown && impulseup) {
                 if (down)
                         val = 0.75;     // released and re-pressed this frame
                 else
                         val = 0.25;     // pressed and released this frame
+        }
 
         key->state &= 1;                // clear impulses
-        
+
         return val;
 }
 
diff --git a/apps/plugins/sdl/progs/quake/d_iface.h b/apps/plugins/sdl/progs/quake/d_iface.h
index 8dc5ce94bc..1dbc7f3580 100644
--- a/apps/plugins/sdl/progs/quake/d_iface.h
+++ b/apps/plugins/sdl/progs/quake/d_iface.h
@@ -182,6 +182,9 @@ extern byte				*r_skysource;
 #define DR_TRANSPARENT  1
 
 // !!! must be kept the same as in quakeasm.h !!!
+#ifdef TRANSPARENT_COLOR
+#undef TRANSPARENT_COLOR
+#endif
 #define TRANSPARENT_COLOR       0xFF
 
 extern void *acolormap; // FIXME: should go away
diff --git a/apps/plugins/sdl/progs/quake/mathlib.h b/apps/plugins/sdl/progs/quake/mathlib.h
index 5f7ae430f1..4a91274589 100644
--- a/apps/plugins/sdl/progs/quake/mathlib.h
+++ b/apps/plugins/sdl/progs/quake/mathlib.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -69,11 +69,13 @@ void CrossProduct (vec3_t v1, vec3_t v2, vec3_t cross);
 //void VectorNormalizeNoRet (vec3_t v); // uses finvsqrt
 //float VectorNormalize (vec3_t v);             // returns vector length
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
 static inline float InvSqrt( float number ) {
     long i;
     float x2, y;
     const float threehalfs = 1.5F;
- 
+
     x2 = number * 0.5F;
     y  = number;
     i  = * ( long * ) &y;                       // evil floating point bit level hacking
@@ -84,13 +86,14 @@ static inline float InvSqrt( float number ) {
 
     return y;
 }
+#pragma GCC diagnostic pop
 
 static inline void VectorNormalizeNoRet (vec3_t v)
 {
         float   length, ilength;
 
         ilength = InvSqrt(v[0]*v[0] + v[1]*v[1] + v[2]*v[2]);
-        
+
         v[0] *= ilength;
         v[1] *= ilength;
         v[2] *= ilength;
@@ -110,7 +113,7 @@ static inline float VectorNormalize (vec3_t v)
                 v[1] *= ilength;
                 v[2] *= ilength;
         }
-                
+
         return length;
 
 }
diff --git a/apps/plugins/sdl/progs/quake/net.h b/apps/plugins/sdl/progs/quake/net.h
index 813472c0c6..6b6be3d36e 100644
--- a/apps/plugins/sdl/progs/quake/net.h
+++ b/apps/plugins/sdl/progs/quake/net.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -126,7 +126,7 @@ typedef struct qsocket_s
         qboolean                disconnected;
         qboolean                canSend;
         qboolean                sendNext;
-        
+
         int                             driver;
         int                             landriver;
         int                             socket;
@@ -314,7 +314,7 @@ typedef struct _PollProcedure
 {
         struct _PollProcedure   *next;
         double                                  nextTime;
-        void                                    (*procedure)();
+        void                                    (*procedure)(void *);
         void                                    *arg;
 } PollProcedure;
 
diff --git a/apps/plugins/sdl/progs/quake/server.h b/apps/plugins/sdl/progs/quake/server.h
index 5fe33deca0..c0d879ec7d 100644
--- a/apps/plugins/sdl/progs/quake/server.h
+++ b/apps/plugins/sdl/progs/quake/server.h
@@ -250,7 +250,7 @@ void SV_MoveToGoal (void);
 
 void SV_CheckForNewClients (void);
 void SV_RunClients (void);
-void SV_SaveSpawnparms ();
+void SV_SaveSpawnparms (void);
 #ifdef QUAKE2
 void SV_SpawnServer (char *server, char *startspot);
 #else