]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - view.c
fix lightmap loading from TGAs; fix display of QC-initiated downloads
[xonotic/darkplaces.git] / view.c
diff --git a/view.c b/view.c
index be9bea79bb3bb969b0bd87ee0c7ec2d658319bc5..72d812bb1bf9752fbf2f511862ee9fb4df15d7c4 100644 (file)
--- a/view.c
+++ b/view.c
@@ -22,6 +22,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "cl_collision.h"
 
+void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin);
+
 /*
 
 The view is allowed to move slightly from it's true position for bobbing,
@@ -34,14 +36,16 @@ when crossing a water boudnary.
 cvar_t cl_rollspeed = {0, "cl_rollspeed", "200", "how much strafing is necessary to tilt the view"};
 cvar_t cl_rollangle = {0, "cl_rollangle", "2.0", "how much to tilt the view when strafing"};
 
-cvar_t cl_bob = {0, "cl_bob","0.02", "view bobbing amount"};
-cvar_t cl_bobcycle = {0, "cl_bobcycle","0.6", "view bobbing speed"};
-cvar_t cl_bobup = {0, "cl_bobup","0.5", "view bobbing adjustment that makes the up or down swing of the bob last longer"};
+cvar_t cl_bob = {CVAR_SAVE, "cl_bob","0.02", "view bobbing amount"};
+cvar_t cl_bobcycle = {CVAR_SAVE, "cl_bobcycle","0.6", "view bobbing speed"};
+cvar_t cl_bobup = {CVAR_SAVE, "cl_bobup","0.5", "view bobbing adjustment that makes the up or down swing of the bob last longer"};
+
+cvar_t cl_bobmodel = {CVAR_SAVE, "cl_bobmodel", "1", "enables gun bobbing"};
+cvar_t cl_bobmodel_side = {CVAR_SAVE, "cl_bobmodel_side", "0.15", "gun bobbing sideways sway amount"};
+cvar_t cl_bobmodel_up = {CVAR_SAVE, "cl_bobmodel_up", "0.06", "gun bobbing upward movement amount"};
+cvar_t cl_bobmodel_speed = {CVAR_SAVE, "cl_bobmodel_speed", "7", "gun bobbing speed"};
 
-cvar_t cl_bobmodel = {0, "cl_bobmodel", "1", "enables gun bobbing"};
-cvar_t cl_bobmodel_side = {0, "cl_bobmodel_side", "0.05", "gun bobbing sideways sway amount"};
-cvar_t cl_bobmodel_up = {0, "cl_bobmodel_up", "0.02", "gun bobbing upward movement amount"};
-cvar_t cl_bobmodel_speed = {0, "cl_bobmodel_speed", "7", "gun bobbing speed"};
+cvar_t cl_viewmodel_scale = {0, "cl_viewmodel_scale", "1", "changes size of gun model, lower values prevent poking into walls but cause strange artifacts on lighting and especially r_stereo/vid_stereobuffer options where the size of the gun becomes visible"};
 
 cvar_t v_kicktime = {0, "v_kicktime", "0.5", "how long a view kick from damage lasts"};
 cvar_t v_kickroll = {0, "v_kickroll", "0.6", "how much a view kick from damage rolls your view"};
@@ -66,10 +70,15 @@ cvar_t cl_stairsmoothspeed = {CVAR_SAVE, "cl_stairsmoothspeed", "160", "how fast
 cvar_t chase_back = {CVAR_SAVE, "chase_back", "48", "chase cam distance from the player"};
 cvar_t chase_up = {CVAR_SAVE, "chase_up", "24", "chase cam distance from the player"};
 cvar_t chase_active = {CVAR_SAVE, "chase_active", "0", "enables chase cam"};
+cvar_t chase_overhead = {CVAR_SAVE, "chase_overhead", "0", "chase cam looks straight down if this is not zero"};
 // GAME_GOODVSBAD2
 cvar_t chase_stevie = {0, "chase_stevie", "0", "chase cam view from above (used only by GoodVsBad2)"};
 
 cvar_t v_deathtilt = {0, "v_deathtilt", "1", "whether to use sideways view when dead"};
+cvar_t v_deathtiltangle = {0, "v_deathtiltangle", "80", "what roll angle to use when tilting the view while dead"};
+
+// Prophecy camera pitchangle by Alexander "motorsep" Zubov
+cvar_t chase_pitchangle = {CVAR_SAVE, "chase_pitchangle", "55", "chase cam pitch angle"};
 
 float  v_dmg_time, v_dmg_roll, v_dmg_pitch;
 
@@ -154,7 +163,7 @@ void V_DriftPitch (void)
                if ( fabs(cl.cmd.forwardmove) < cl_forwardspeed.value)
                        cl.driftmove = 0;
                else
-                       cl.driftmove += cl.frametime;
+                       cl.driftmove += cl.realframetime;
 
                if ( cl.driftmove > v_centermove.value)
                {
@@ -171,8 +180,8 @@ void V_DriftPitch (void)
                return;
        }
 
-       move = cl.frametime * cl.pitchvel;
-       cl.pitchvel += cl.frametime * v_centerspeed.value;
+       move = cl.realframetime * cl.pitchvel;
+       cl.pitchvel += cl.realframetime * v_centerspeed.value;
 
        if (delta > 0)
        {
@@ -223,6 +232,9 @@ void V_ParseDamage (void)
        blood = MSG_ReadByte ();
        MSG_ReadVector(from, cls.protocol);
 
+       // Send the Dmg Globals to CSQC
+       CL_VM_UpdateDmgGlobals(blood, armor, from);
+
        count = blood*0.5 + armor*0.5;
        if (count < 10)
                count = 10;
@@ -230,6 +242,7 @@ void V_ParseDamage (void)
        cl.faceanimtime = cl.time + 0.2;                // put sbar face into pain frame
 
        cl.cshifts[CSHIFT_DAMAGE].percent += 3*count;
+       cl.cshifts[CSHIFT_DAMAGE].alphafade = 150;
        if (cl.cshifts[CSHIFT_DAMAGE].percent < 0)
                cl.cshifts[CSHIFT_DAMAGE].percent = 0;
        if (cl.cshifts[CSHIFT_DAMAGE].percent > 150)
@@ -255,9 +268,9 @@ void V_ParseDamage (void)
        }
 
        // calculate view angle kicks
-       if (cl_entities[cl.viewentity].state_current.active)
+       if (cl.entities[cl.viewentity].state_current.active)
        {
-               ent = &cl_entities[cl.viewentity];
+               ent = &cl.entities[cl.viewentity];
                Matrix4x4_Transform(&ent->render.inversematrix, from, localfrom);
                VectorNormalize(localfrom);
                v_dmg_pitch = count * localfrom[0] * v_kickpitch.value;
@@ -275,10 +288,10 @@ V_cshift_f
 */
 static void V_cshift_f (void)
 {
-       v_cshift.destcolor[0] = atoi(Cmd_Argv(1));
-       v_cshift.destcolor[1] = atoi(Cmd_Argv(2));
-       v_cshift.destcolor[2] = atoi(Cmd_Argv(3));
-       v_cshift.percent = atoi(Cmd_Argv(4));
+       v_cshift.destcolor[0] = atof(Cmd_Argv(1));
+       v_cshift.destcolor[1] = atof(Cmd_Argv(2));
+       v_cshift.destcolor[2] = atof(Cmd_Argv(3));
+       v_cshift.percent = atof(Cmd_Argv(4));
 }
 
 
@@ -291,10 +304,30 @@ When you run over an item, the server sends this command
 */
 static void V_BonusFlash_f (void)
 {
-       cl.cshifts[CSHIFT_BONUS].destcolor[0] = 215;
-       cl.cshifts[CSHIFT_BONUS].destcolor[1] = 186;
-       cl.cshifts[CSHIFT_BONUS].destcolor[2] = 69;
-       cl.cshifts[CSHIFT_BONUS].percent = 50;
+       if(Cmd_Argc() == 1)
+       {
+               cl.cshifts[CSHIFT_BONUS].destcolor[0] = 215;
+               cl.cshifts[CSHIFT_BONUS].destcolor[1] = 186;
+               cl.cshifts[CSHIFT_BONUS].destcolor[2] = 69;
+               cl.cshifts[CSHIFT_BONUS].percent = 50;
+               cl.cshifts[CSHIFT_BONUS].alphafade = 100;
+       }
+       else if(Cmd_Argc() >= 4 && Cmd_Argc() <= 6)
+       {
+               cl.cshifts[CSHIFT_BONUS].destcolor[0] = atof(Cmd_Argv(1)) * 255;
+               cl.cshifts[CSHIFT_BONUS].destcolor[1] = atof(Cmd_Argv(2)) * 255;
+               cl.cshifts[CSHIFT_BONUS].destcolor[2] = atof(Cmd_Argv(3)) * 255;
+               if(Cmd_Argc() >= 5)
+                       cl.cshifts[CSHIFT_BONUS].percent = atof(Cmd_Argv(4)) * 255; // yes, these are HEXADECIMAL percent ;)
+               else
+                       cl.cshifts[CSHIFT_BONUS].percent = 50;
+               if(Cmd_Argc() >= 6)
+                       cl.cshifts[CSHIFT_BONUS].alphafade = atof(Cmd_Argv(5)) * 255;
+               else
+                       cl.cshifts[CSHIFT_BONUS].alphafade = 100;
+       }
+       else
+               Con_Printf("usage:\nbf, or bf R G B [A [alphafade]]\n");
 }
 
 /*
@@ -316,112 +349,162 @@ V_CalcRefdef
 
 ==================
 */
+#if 0
+static vec3_t eyeboxmins = {-16, -16, -24};
+static vec3_t eyeboxmaxs = { 16,  16,  32};
+#endif
 void V_CalcRefdef (void)
 {
-       static float oldz;
        entity_t *ent;
-       float vieworg[3], gunorg[3], viewangles[3];
+       float vieworg[3], gunorg[3], viewangles[3], smoothtime;
+// begin of chase camera bounding box size for proper collisions by Alexander Zubov
+       vec3_t camboxmins = {-3, -3, -3};
+       vec3_t camboxmaxs = {3, 3, 3};
+// end of chase camera bounding box size for proper collisions by Alexander Zubov
        trace_t trace;
-       if(csqc_loaded)
-               return;
        VectorClear(gunorg);
-       Matrix4x4_CreateIdentity(&viewmodelmatrix);
-       Matrix4x4_CreateIdentity(&r_refdef.viewentitymatrix);
+       viewmodelmatrix = identitymatrix;
+       r_refdef.view.matrix = identitymatrix;
        if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
                // ent is the view entity (visible when out of body)
-               ent = &cl_entities[cl.viewentity];
+               ent = &cl.entities[cl.viewentity];
+               // player can look around, so take the origin from the entity,
+               // and the angles from the input system
+               Matrix4x4_OriginFromMatrix(&ent->render.matrix, vieworg);
+               VectorCopy(cl.viewangles, viewangles);
+
+               // calculate how much time has passed since the last V_CalcRefdef
+               smoothtime = bound(0, cl.time - cl.stairsmoothtime, 0.1);
+               cl.stairsmoothtime = cl.time;
+
+               // fade damage flash
+               if (v_dmg_time > 0)
+                       v_dmg_time -= bound(0, smoothtime, 0.1);
+
                if (cl.intermission)
                {
                        // entity is a fixed camera, just copy the matrix
-                       Matrix4x4_Copy(&r_refdef.viewentitymatrix, &ent->render.matrix);
-                       Matrix4x4_Copy(&viewmodelmatrix, &ent->render.matrix);
-                       r_refdef.viewentitymatrix.m[2][3] += cl.stats[STAT_VIEWHEIGHT];
-                       viewmodelmatrix.m[2][3] += cl.stats[STAT_VIEWHEIGHT];
+                       if (cls.protocol == PROTOCOL_QUAKEWORLD)
+                               Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, cl.qw_intermission_origin[0], cl.qw_intermission_origin[1], cl.qw_intermission_origin[2], cl.qw_intermission_angles[0], cl.qw_intermission_angles[1], cl.qw_intermission_angles[2], 1);
+                       else
+                       {
+                               r_refdef.view.matrix = ent->render.matrix;
+                               Matrix4x4_AdjustOrigin(&r_refdef.view.matrix, 0, 0, cl.stats[STAT_VIEWHEIGHT]);
+                       }
+                       viewmodelmatrix = r_refdef.view.matrix;
                }
                else
                {
-                       // player can look around, so take the origin from the entity,
-                       // and the angles from the input system
-                       Matrix4x4_OriginFromMatrix(&ent->render.matrix, vieworg);
-                       VectorCopy(cl.viewangles, viewangles);
-
-                       if (cl.onground)
+                       // smooth stair stepping, but only if onground and enabled
+                       if (!cl.onground || cl_stairsmoothspeed.value <= 0)
+                               cl.stairsmoothz = vieworg[2];
+                       else
                        {
-                               if (!cl.oldonground)
-                                       cl.hitgroundtime = cl.time;
-                               cl.lastongroundtime = cl.time;
+                               if (cl.stairsmoothz < vieworg[2])
+                                       vieworg[2] = cl.stairsmoothz = bound(vieworg[2] - 16, cl.stairsmoothz + smoothtime * cl_stairsmoothspeed.value, vieworg[2]);
+                               else if (cl.stairsmoothz > vieworg[2])
+                                       vieworg[2] = cl.stairsmoothz = bound(vieworg[2], cl.stairsmoothz - smoothtime * cl_stairsmoothspeed.value, vieworg[2] + 16);
                        }
-                       cl.oldonground = cl.onground;
 
-                       // stair smoothing
-                       //Con_Printf("cl.onground %i oldz %f newz %f\n", cl.onground, oldz, vieworg[2]);
-                       if (cl.onground && oldz < vieworg[2])
-                       {
-                               oldz += (cl.time - cl.oldtime) * cl_stairsmoothspeed.value;
-                               oldz = vieworg[2] = bound(vieworg[2] - 16, oldz, vieworg[2]);
-                       }
-                       else if (cl.onground && oldz > vieworg[2])
-                       {
-                               oldz -= (cl.time - cl.oldtime) * cl_stairsmoothspeed.value;
-                               oldz = vieworg[2] = bound(vieworg[2], oldz, vieworg[2] + 16);
-                       }
-                       else
-                               oldz = vieworg[2];
+                       // apply qw weapon recoil effect (this did not work in QW)
+                       // TODO: add a cvar to disable this
+                       viewangles[PITCH] += cl.qw_weaponkick;
+
+                       // apply the viewofs (even if chasecam is used)
+                       vieworg[2] += cl.stats[STAT_VIEWHEIGHT];
 
                        if (chase_active.value)
                        {
-                               // observing entity from third person
-                               vec_t camback, camup, dist, forward[3], chase_dest[3];
+                               // observing entity from third person. Added "campitch" by Alexander "motorsep" Zubov
+                               vec_t camback, camup, dist, campitch, forward[3], chase_dest[3];
 
-                               camback = bound(0, chase_back.value, 128);
-                               if (chase_back.value != camback)
-                                       Cvar_SetValueQuick(&chase_back, camback);
-                               camup = bound(-48, chase_up.value, 96);
-                               if (chase_up.value != camup)
-                                       Cvar_SetValueQuick(&chase_up, camup);
+                               camback = chase_back.value;
+                               camup = chase_up.value;
+                               campitch = chase_pitchangle.value;
 
-                               // this + 22 is to match view_ofs for compatibility with older versions
-                               camup += 22;
+                               AngleVectors(viewangles, forward, NULL, NULL);
 
-                               if (gamemode == GAME_GOODVSBAD2 && chase_stevie.integer)
+                               if (chase_overhead.integer)
                                {
-                                       // look straight down from high above
-                                       viewangles[0] = 90;
-                                       camback = 2048;
+#if 1
+                                       vec3_t offset;
+                                       vec3_t bestvieworg;
+#endif
+                                       vec3_t up;
+                                       viewangles[PITCH] = 0;
+                                       AngleVectors(viewangles, forward, NULL, up);
+                                       // trace a little further so it hits a surface more consistently (to avoid 'snapping' on the edge of the range)
+                                       chase_dest[0] = vieworg[0] - forward[0] * camback + up[0] * camup;
+                                       chase_dest[1] = vieworg[1] - forward[1] * camback + up[1] * camup;
+                                       chase_dest[2] = vieworg[2] - forward[2] * camback + up[2] * camup;
+#if 0
+                                       //trace = CL_Move(vieworg, eyeboxmins, eyeboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+                                       trace = CL_Move(vieworg, camboxmins, camboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+                                       VectorCopy(trace.endpos, vieworg);
+                                       vieworg[2] -= 8;
+#else
+                                       // trace from first person view location to our chosen third person view location
+                                       trace = CL_Move(vieworg, camboxmins, camboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+                                       VectorCopy(trace.endpos, bestvieworg);
+                                       offset[2] = 0;
+                                       for (offset[0] = -16;offset[0] <= 16;offset[0] += 8)
+                                       {
+                                               for (offset[1] = -16;offset[1] <= 16;offset[1] += 8)
+                                               {
+                                                       AngleVectors(viewangles, NULL, NULL, up);
+                                                       chase_dest[0] = vieworg[0] - forward[0] * camback + up[0] * camup + offset[0];
+                                                       chase_dest[1] = vieworg[1] - forward[1] * camback + up[1] * camup + offset[1];
+                                                       chase_dest[2] = vieworg[2] - forward[2] * camback + up[2] * camup + offset[2];
+                                                       trace = CL_Move(vieworg, camboxmins, camboxmaxs, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+                                                       if (bestvieworg[2] > trace.endpos[2])
+                                                               bestvieworg[2] = trace.endpos[2];
+                                               }
+                                       }
+                                       bestvieworg[2] -= 8;
+                                       VectorCopy(bestvieworg, vieworg);
+#endif
+                                       viewangles[PITCH] = campitch;
                                }
-                               AngleVectors(viewangles, forward, NULL, NULL);
+                               else
+                               {
+                                       if (gamemode == GAME_GOODVSBAD2 && chase_stevie.integer)
+                                       {
+                                               // look straight down from high above
+                                               viewangles[PITCH] = 90;
+                                               camback = 2048;
+                                               VectorSet(forward, 0, 0, -1);
+                                       }
 
-                               // trace a little further so it hits a surface more consistently (to avoid 'snapping' on the edge of the range)
-                               dist = -camback - 8;
-                               chase_dest[0] = vieworg[0] + forward[0] * dist;
-                               chase_dest[1] = vieworg[1] + forward[1] * dist;
-                               chase_dest[2] = vieworg[2] + forward[2] * dist + camup;
-                               trace = CL_TraceBox(vieworg, vec3_origin, vec3_origin, chase_dest, true, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_SKY, false);
-                               VectorMAMAM(1, trace.endpos, 8, forward, 4, trace.plane.normal, vieworg);
+                                       // trace a little further so it hits a surface more consistently (to avoid 'snapping' on the edge of the range)
+                                       dist = -camback - 8;
+                                       chase_dest[0] = vieworg[0] + forward[0] * dist;
+                                       chase_dest[1] = vieworg[1] + forward[1] * dist;
+                                       chase_dest[2] = vieworg[2] + forward[2] * dist + camup;
+                                       trace = CL_Move(vieworg, vec3_origin, vec3_origin, chase_dest, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_SKY, true, false, NULL, false);
+                                       VectorMAMAM(1, trace.endpos, 8, forward, 4, trace.plane.normal, vieworg);
+                               }
                        }
                        else
                        {
                                // first person view from entity
                                // angles
                                if (cl.stats[STAT_HEALTH] <= 0 && v_deathtilt.integer)
-                                       viewangles[ROLL] = 80;  // dead view angle
+                                       viewangles[ROLL] = v_deathtiltangle.value;
                                VectorAdd(viewangles, cl.punchangle, viewangles);
                                viewangles[ROLL] += V_CalcRoll(cl.viewangles, cl.movement_velocity);
                                if (v_dmg_time > 0)
                                {
                                        viewangles[ROLL] += v_dmg_time/v_kicktime.value*v_dmg_roll;
                                        viewangles[PITCH] += v_dmg_time/v_kicktime.value*v_dmg_pitch;
-                                       v_dmg_time -= cl.frametime;
                                }
                                // origin
                                VectorAdd(vieworg, cl.punchvector, vieworg);
-                               vieworg[2] += cl.stats[STAT_VIEWHEIGHT];
                                if (cl.stats[STAT_HEALTH] > 0)
                                {
                                        double xyspeed, bob;
 
-                                       xyspeed = sqrt(cl.velocity[0]*cl.velocity[0] + cl.velocity[1]*cl.velocity[1]);
+                                       xyspeed = sqrt(cl.movement_velocity[0]*cl.movement_velocity[0] + cl.movement_velocity[1]*cl.movement_velocity[1]);
                                        if (cl_bob.value && cl_bobcycle.value)
                                        {
                                                float cycle;
@@ -444,7 +527,7 @@ void V_CalcRefdef (void)
 
                                        VectorCopy(vieworg, gunorg);
 
-                                       if (cl_bobmodel.value)
+                                       if (cl_bob.value && cl_bobmodel.value)
                                        {
                                                // calculate for swinging gun model
                                                // the gun bobs when running on the ground, but doesn't bob when you're in the air.
@@ -479,34 +562,37 @@ void V_CalcRefdef (void)
 
                                                bspeed = bound (0, xyspeed, 400) * 0.01f;
                                                AngleVectors (viewangles, forward, right, up);
-                                               bob = bspeed * cl_bobmodel_side.value * sin (s) * t;
+                                               bob = bspeed * cl_bobmodel_side.value * cl_viewmodel_scale.value * sin (s) * t;
                                                VectorMA (gunorg, bob, right, gunorg);
-                                               bob = bspeed * cl_bobmodel_up.value * cos (s * 2) * t;
+                                               bob = bspeed * cl_bobmodel_up.value * cl_viewmodel_scale.value * cos (s * 2) * t;
                                                VectorMA (gunorg, bob, up, gunorg);
                                        }
                                }
                        }
                        // calculate a view matrix for rendering the scene
                        if (v_idlescale.value)
-                               Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0] + v_idlescale.value * sin(cl.time*v_ipitch_cycle.value) * v_ipitch_level.value, viewangles[1] + v_idlescale.value * sin(cl.time*v_iyaw_cycle.value) * v_iyaw_level.value, viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1);
+                               Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0] + v_idlescale.value * sin(cl.time*v_ipitch_cycle.value) * v_ipitch_level.value, viewangles[1] + v_idlescale.value * sin(cl.time*v_iyaw_cycle.value) * v_iyaw_level.value, viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1);
                        else
-                               Matrix4x4_CreateFromQuakeEntity(&r_refdef.viewentitymatrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0], viewangles[1], viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1);
+                               Matrix4x4_CreateFromQuakeEntity(&r_refdef.view.matrix, vieworg[0], vieworg[1], vieworg[2], viewangles[0], viewangles[1], viewangles[2] + v_idlescale.value * sin(cl.time*v_iroll_cycle.value) * v_iroll_level.value, 1);
                        // calculate a viewmodel matrix for use in view-attached entities
-                       Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, gunorg[0], gunorg[1], gunorg[2], viewangles[0], viewangles[1], viewangles[2], 0.3);
-                       VectorCopy(vieworg, csqc_origin);
-                       VectorCopy(viewangles, csqc_angles);
+                       Matrix4x4_CreateFromQuakeEntity(&viewmodelmatrix, gunorg[0], gunorg[1], gunorg[2], viewangles[0], viewangles[1], viewangles[2], cl_viewmodel_scale.value);
+                       VectorCopy(vieworg, cl.csqc_origin);
+                       VectorCopy(viewangles, cl.csqc_angles);
                }
        }
 }
 
 void V_FadeViewFlashs(void)
 {
+       // don't flash if time steps backwards
+       if (cl.time <= cl.oldtime)
+               return;
        // drop the damage value
-       cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*150;
+       cl.cshifts[CSHIFT_DAMAGE].percent -= (cl.time - cl.oldtime)*cl.cshifts[CSHIFT_DAMAGE].alphafade;
        if (cl.cshifts[CSHIFT_DAMAGE].percent <= 0)
                cl.cshifts[CSHIFT_DAMAGE].percent = 0;
        // drop the bonus value
-       cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*100;
+       cl.cshifts[CSHIFT_BONUS].percent -= (cl.time - cl.oldtime)*cl.cshifts[CSHIFT_BONUS].alphafade;
        if (cl.cshifts[CSHIFT_BONUS].percent <= 0)
                cl.cshifts[CSHIFT_BONUS].percent = 0;
 }
@@ -521,12 +607,12 @@ void V_CalcViewBlend(void)
        r_refdef.viewblend[3] = 0;
        r_refdef.frustumscale_x = 1;
        r_refdef.frustumscale_y = 1;
-       if (cls.state == ca_connected && cls.signon == SIGNONS && gl_polyblend.value > 0)
+       if (cls.state == ca_connected && cls.signon == SIGNONS)
        {
                // set contents color
                int supercontents;
                vec3_t vieworigin;
-               Matrix4x4_OriginFromMatrix(&r_refdef.viewentitymatrix, vieworigin);
+               Matrix4x4_OriginFromMatrix(&r_refdef.view.matrix, vieworigin);
                supercontents = CL_PointSuperContents(vieworigin);
                if (supercontents & SUPERCONTENTS_LIQUIDSMASK)
                {
@@ -550,7 +636,7 @@ void V_CalcViewBlend(void)
                                cl.cshifts[CSHIFT_CONTENTS].destcolor[1] = 80;
                                cl.cshifts[CSHIFT_CONTENTS].destcolor[2] = 50;
                        }
-                       cl.cshifts[CSHIFT_CONTENTS].percent = 150 >> 1;
+                       cl.cshifts[CSHIFT_CONTENTS].percent = 150 * 0.5;
                }
                else
                {
@@ -633,7 +719,7 @@ V_Init
 void V_Init (void)
 {
        Cmd_AddCommand ("v_cshift", V_cshift_f, "sets tint color of view");
-       Cmd_AddCommand ("bf", V_BonusFlash_f, "briefly flashes a bright color tint on view (used when items are picked up)");
+       Cmd_AddCommand ("bf", V_BonusFlash_f, "briefly flashes a bright color tint on view (used when items are picked up); optionally takes R G B [A [alphafade]] arguments to specify how the flash looks");
        Cmd_AddCommand ("centerview", V_StartPitchDrift, "gradually recenter view (stop looking up/down)");
 
        Cvar_RegisterVariable (&v_centermove);
@@ -659,6 +745,8 @@ void V_Init (void)
        Cvar_RegisterVariable (&cl_bobmodel_up);
        Cvar_RegisterVariable (&cl_bobmodel_speed);
 
+       Cvar_RegisterVariable (&cl_viewmodel_scale);
+
        Cvar_RegisterVariable (&v_kicktime);
        Cvar_RegisterVariable (&v_kickroll);
        Cvar_RegisterVariable (&v_kickpitch);
@@ -668,9 +756,12 @@ void V_Init (void)
        Cvar_RegisterVariable (&chase_back);
        Cvar_RegisterVariable (&chase_up);
        Cvar_RegisterVariable (&chase_active);
+       Cvar_RegisterVariable (&chase_overhead);
+       Cvar_RegisterVariable (&chase_pitchangle);
        if (gamemode == GAME_GOODVSBAD2)
                Cvar_RegisterVariable (&chase_stevie);
 
        Cvar_RegisterVariable (&v_deathtilt);
+       Cvar_RegisterVariable (&v_deathtiltangle);
 }