Fix remaining clang compile warnings

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12932 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_collision.c b/cl_collision.c
index d678e1b82118b5c749cdfac8357f838df00fb69c..559e91faf8f74d9d90a399708fe33b3f416faebb 100644 (file)
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -267,8 +267,8 @@ trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -491,8 +491,8 @@ trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -740,8 +740,8 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -978,7 +978,7 @@ trace_t CL_Cache_TraceLineSurfaces(const vec3_t start, const vec3_t end, int typ
                if (!model)
                        continue;
                // animated models are not suitable for caching
-               if ((touch->priv.server->frameblend && (touch->priv.server->frameblend[0].lerp != 1.0 || touch->priv.server->frameblend[0].subframe != 0)) || touch->priv.server->skeleton.relativetransforms)
+               if ((&touch->priv.server->frameblend[0] && (touch->priv.server->frameblend[0].lerp != 1.0 || touch->priv.server->frameblend[0].subframe != 0)) || touch->priv.server->skeleton.relativetransforms)
                        continue;
                if (type == MOVE_NOMONSTERS && PRVM_clientedictfloat(touch, solid) != SOLID_BSP)
                        continue;

diff --git a/cl_video.c b/cl_video.c
index 9c8ca99948765603e61b8456def9cce438129a78..7ecf3f196135d63cc268c7e41f542805642a7468 100644 (file)
--- a/cl_video.c
+++ b/cl_video.c
@@ -199,7 +199,7 @@ static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile )
        if (numsubs > 0) // make true len for prev sub, autofix overlapping subtitles
        {
                if (video->subtitle_end[numsubs-1] <= 0)
-                       video->subtitle_end[numsubs-1] = 99999999; // fixme: make it end when video ends?
+                       video->subtitle_end[numsubs-1] = (float)99999999; // fixme: make it end when video ends?
                else
                        video->subtitle_end[numsubs-1] = video->subtitle_start[numsubs-1] + video->subtitle_end[numsubs-1];
        }

diff --git a/sv_phys.c b/sv_phys.c
index af3768209a02293222677e625fb329fde899af64..d0371577f65ab4f276fc2e53d850014eefd25bbf 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -165,8 +165,8 @@ trace_t SV_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -320,8 +320,8 @@ trace_t SV_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)
@@ -502,8 +502,8 @@ trace_t SV_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
        // debug override to test against everything
        if (sv_debugmove.integer)
        {
-               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
-               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+               clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = (vec_t)-999999999;
+               clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  (vec_t)999999999;
        }
 
        // if the passedict is world, make it NULL (to avoid two checks each time)