remove some more dead code ("Dead Increment" bugs from clang-analyzer); however,...

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

diff --git a/cl_input.c b/cl_input.c
index 2dd21acd06d6a296af379bc67e10cfd42781b988..94c7ef3b07ec2b42a6b8f2db4995cae492b7748e 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -697,7 +697,6 @@ void CL_Input (void)
                {
                        // digital direction, analog amount
                        vec_t wishvel_x, wishvel_y;
                {
                        // digital direction, analog amount
                        vec_t wishvel_x, wishvel_y;

-                       f *= max(cl_sidespeed.value, max(cl_forwardspeed.value, cl_backspeed.value));

                        wishvel_x = fabs(cl.cmd.forwardmove);
                        wishvel_y = fabs(cl.cmd.sidemove);
                        if(wishvel_x != 0 && wishvel_y != 0 && wishvel_x != wishvel_y)
                        wishvel_x = fabs(cl.cmd.forwardmove);
                        wishvel_y = fabs(cl.cmd.sidemove);
                        if(wishvel_x != 0 && wishvel_y != 0 && wishvel_x != wishvel_y)

diff --git a/dpsoftrast.c b/dpsoftrast.c
index 4967ef0eb7214422093812fcc5714571fdf153af..754cf685ddfe84d3a02d7f63a5dfa44bf5350b20 100644 (file)
--- a/dpsoftrast.c
+++ b/dpsoftrast.c
@@ -2055,11 +2055,9 @@ static void DPSOFTRAST_Draw_Span_FinishBGRA8(DPSOFTRAST_State_Thread *thread, co
        int subx;
        const unsigned int * RESTRICT ini = (const unsigned int *)in4ub;
        unsigned char * RESTRICT pixelmask = span->pixelmask;
        int subx;
        const unsigned int * RESTRICT ini = (const unsigned int *)in4ub;
        unsigned char * RESTRICT pixelmask = span->pixelmask;

-       unsigned char * RESTRICT pixel = (unsigned char *)dpsoftrast.fb_colorpixels[0];

        unsigned int * RESTRICT pixeli = (unsigned int *)dpsoftrast.fb_colorpixels[0];
        unsigned int * RESTRICT pixeli = (unsigned int *)dpsoftrast.fb_colorpixels[0];

-       if (!pixel)
+       if (!pixeli)

                return;
                return;

-       pixel += (span->y * dpsoftrast.fb_width + span->x) * 4;

        pixeli += span->y * dpsoftrast.fb_width + span->x;
        // handle alphatest now (this affects depth writes too)
        if (thread->shader_permutation & SHADERPERMUTATION_ALPHAKILL)
        pixeli += span->y * dpsoftrast.fb_width + span->x;
        // handle alphatest now (this affects depth writes too)
        if (thread->shader_permutation & SHADERPERMUTATION_ALPHAKILL)

diff --git a/gl_rmain.c b/gl_rmain.c
index b5c1a02c5eeaef9c3dfa40e15d629b9957182391..13660bfe94f6e2a49bd3be21ce4ede288d6123b7 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -3584,7 +3584,7 @@ skinframe_t *R_SkinFrame_LoadInternalQuake(const char *name, int textureflags, i
        skinframe = R_SkinFrame_Find(name, textureflags, width, height, skindata ? CRC_Block(skindata, width*height) : 0, true);
        if (skinframe->base)
                return skinframe;
        skinframe = R_SkinFrame_Find(name, textureflags, width, height, skindata ? CRC_Block(skindata, width*height) : 0, true);
        if (skinframe->base)
                return skinframe;

-       textureflags &= ~TEXF_FORCE_RELOAD;
+       //textureflags &= ~TEXF_FORCE_RELOAD;

 
        skinframe->stain = NULL;
        skinframe->merged = NULL;
 
        skinframe->stain = NULL;
        skinframe->merged = NULL;