From 786fa4540110bd35471cdd69060b7390ab7dadf1 Mon Sep 17 00:00:00 2001
From: Christopher Schwarz <lakitu7@gmail.com>
Date: Sat, 6 Aug 2011 20:37:32 +0000
Subject: * (bug 4959) Merge ioq3 r1822, r1874 (/dev/humancontroller)

---
 src/cgame/cg_local.h    | 5 +----
 src/cgame/cg_snapshot.c | 2 +-
 src/cgame/cg_view.c     | 7 -------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 98f72809..42b5e0e3 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -1084,10 +1084,7 @@ typedef struct
   float         v_dmg_pitch;
   float         v_dmg_roll;
 
-  vec3_t        kick_angles;                        // weapon kicks
-  vec3_t        kick_origin;
-
-  qboolean      chaseFollow;               
+  qboolean      chaseFollow;
 
   // temp working variables for player view
   float         bobfracsin;
diff --git a/src/cgame/cg_snapshot.c b/src/cgame/cg_snapshot.c
index 31cc02ec..673558d3 100644
--- a/src/cgame/cg_snapshot.c
+++ b/src/cgame/cg_snapshot.c
@@ -259,7 +259,7 @@ static snapshot_t *CG_ReadNextSnapshot( void )
 
   if( cg.latestSnapshotNum > cgs.processedSnapshotNum + 1000 )
   {
-    CG_Printf( "WARNING: CG_ReadNextSnapshot: way out of range, %i > %i",
+    CG_Printf( "WARNING: CG_ReadNextSnapshot: way out of range, %i > %i\n",
       cg.latestSnapshotNum, cgs.processedSnapshotNum );
   }
 
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c
index 7d5fe06f..823287d8 100644
--- a/src/cgame/cg_view.c
+++ b/src/cgame/cg_view.c
@@ -579,9 +579,6 @@ void CG_OffsetFirstPersonView( void )
     return;
   }
 
-  // add angles based on weapon kick
-  VectorAdd( angles, cg.kick_angles, angles );
-
   // add angles based on damage kick
   if( cg.damageTime )
   {
@@ -822,10 +819,6 @@ void CG_OffsetFirstPersonView( void )
 
   // add step offset
   CG_StepOffset( );
-
-  // add kick offset
-
-  VectorAdd (origin, cg.kick_origin, origin);
 }
 
 //======================================================================
-- 
cgit