weapon models were not being lit in maps using .lights

[xonotic/darkplaces.git] / view.c

diff --git a/view.c b/view.c
index 9ca7209292966197b044aa65c1a9911ba50c110e..4839e64ef1357a55e054ad29fbc5a9108160c907 100644 (file)
--- a/view.c
+++ b/view.c
@@ -78,8 +78,6 @@ float V_CalcRoll (vec3_t angles, vec3_t velocity)
        side = fabs(side);
 
        value = cl_rollangle.value;
-//     if (cl.inwater)
-//             value *= 6;
 
        if (side < cl_rollspeed.value)
                side = side * value / cl_rollspeed.value;
@@ -112,7 +110,6 @@ static float V_CalcBob (void)
        // (don't count Z, or jumping messes it up)
 
        bob = sqrt(cl.velocity[0]*cl.velocity[0] + cl.velocity[1]*cl.velocity[1]) * cl_bob.value;
-       //Con_Printf ("speed: %5.1f\n", Length(cl.velocity));
        bob = bob*0.3 + bob*0.7*sin(cycle);
        bob = bound(-7, bob, 4);
        return bob;
@@ -121,12 +118,9 @@ static float V_CalcBob (void)
 
 void V_StartPitchDrift (void)
 {
-#if 1
        if (cl.laststop == cl.time)
-       {
                return;         // something else is keeping it from drifting
-       }
-#endif
+
        if (cl.nodrift || !cl.pitchvel)
        {
                cl.pitchvel = v_centerspeed.value;
@@ -192,8 +186,6 @@ static void V_DriftPitch (void)
        move = cl.frametime * cl.pitchvel;
        cl.pitchvel += cl.frametime * v_centerspeed.value;
 
-//Con_Printf ("move: %f (%f)\n", move, cl.frametime);
-
        if (delta > 0)
        {
                if (move > delta)
@@ -215,9 +207,6 @@ static void V_DriftPitch (void)
 }
 
 
-
-
-
 /*
 ==============================================================================
 
@@ -372,19 +361,19 @@ void V_UpdateBlends (void)
                cl.cshifts[CSHIFT_CONTENTS].destcolor[0] = 255;
                cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 80;
                cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 0;
-               cl.cshifts[CSHIFT_CONTENTS].percent = 150;
+               cl.cshifts[CSHIFT_CONTENTS].percent = 150 >> 1;
                break;
        case CONTENTS_SLIME:
                cl.cshifts[CSHIFT_CONTENTS].destcolor[0] = 0;
                cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 25;
                cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 5;
-               cl.cshifts[CSHIFT_CONTENTS].percent = 150;
+               cl.cshifts[CSHIFT_CONTENTS].percent = 150 >> 1;
                break;
        default:
                cl.cshifts[CSHIFT_CONTENTS].destcolor[0] = 130;
                cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 80;
                cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 50;
-               cl.cshifts[CSHIFT_CONTENTS].percent = 128;
+               cl.cshifts[CSHIFT_CONTENTS].percent = 128 >> 1;
        }
 
        if (cl.items & IT_QUAD)
@@ -558,7 +547,7 @@ void V_CalcRefdef (void)
                view->render.colormap = -1; // no special coloring
                view->render.alpha = ent->render.alpha; // LordHavoc: if the player is transparent, so is the gun
                view->render.effects = ent->render.effects;
-               view->render.scale = 1;
+               view->render.scale = 1.0 / 3.0;
 
                // LordHavoc: origin view kick added
                if (!intimerefresh)
@@ -609,4 +598,3 @@ void V_Init (void)
        Cvar_RegisterVariable (&v_kickpitch);
 }
 
-