From 2b52867b74a3ba681d625f3ced51ce0d7c286d39 Mon Sep 17 00:00:00 2001
From: Thilo Schulz <arny@ats.s.bawue.de>
Date: Tue, 8 Feb 2011 18:19:31 +0000
Subject: [PATCH] Code cleanup patch by devhc

---
 code/cgame/cg_local.h   | 3 ---
 code/cgame/cg_view.c    | 7 -------
 code/game/bg_local.h    | 1 -
 code/game/bg_pmove.c    | 1 -
 code/qcommon/qcommon.h  | 2 +-
 code/qcommon/vm.c       | 2 +-
 code/qcommon/vm_local.h | 2 --
 code/sys/sys_main.c     | 2 +-
 8 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/code/cgame/cg_local.h b/code/cgame/cg_local.h
index d000916d..2aa6ba8e 100644
--- a/code/cgame/cg_local.h
+++ b/code/cgame/cg_local.h
@@ -628,9 +628,6 @@ typedef struct {
 	float		v_dmg_pitch;
 	float		v_dmg_roll;
 
-	vec3_t		kick_angles;	// weapon kicks
-	vec3_t		kick_origin;
-
 	// temp working variables for player view
 	float		bobfracsin;
 	int			bobcycle;
diff --git a/code/cgame/cg_view.c b/code/cgame/cg_view.c
index f61bbf90..953093bc 100644
--- a/code/cgame/cg_view.c
+++ b/code/cgame/cg_view.c
@@ -335,9 +335,6 @@ static 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 ) {
 		ratio = cg.time - cg.damageTime;
@@ -422,10 +419,6 @@ static void CG_OffsetFirstPersonView( void ) {
 	// add step offset
 	CG_StepOffset();
 
-	// add kick offset
-
-	VectorAdd (origin, cg.kick_origin, origin);
-
 	// pivot the eye based on a neck length
 #if 0
 	{
diff --git a/code/game/bg_local.h b/code/game/bg_local.h
index 246299ce..1e785f0f 100644
--- a/code/game/bg_local.h
+++ b/code/game/bg_local.h
@@ -60,7 +60,6 @@ extern	pml_t		pml;
 extern	float	pm_stopspeed;
 extern	float	pm_duckScale;
 extern	float	pm_swimScale;
-extern	float	pm_wadeScale;
 
 extern	float	pm_accelerate;
 extern	float	pm_airaccelerate;
diff --git a/code/game/bg_pmove.c b/code/game/bg_pmove.c
index f31222a4..799a3851 100644
--- a/code/game/bg_pmove.c
+++ b/code/game/bg_pmove.c
@@ -34,7 +34,6 @@ pml_t		pml;
 float	pm_stopspeed = 100.0f;
 float	pm_duckScale = 0.25f;
 float	pm_swimScale = 0.50f;
-float	pm_wadeScale = 0.70f;
 
 float	pm_accelerate = 10.0f;
 float	pm_airaccelerate = 1.0f;
diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
index 04d41e1d..db088051 100644
--- a/code/qcommon/qcommon.h
+++ b/code/qcommon/qcommon.h
@@ -1036,7 +1036,7 @@ typedef enum {
 void	Sys_Init (void);
 
 // general development dll loading for virtual machine testing
-void	* QDECL Sys_LoadDll( const char *name, char *fqpath , intptr_t (QDECL **entryPoint)(int, ...),
+void	* QDECL Sys_LoadDll( const char *name, intptr_t (QDECL **entryPoint)(int, ...),
 				  intptr_t (QDECL *systemcalls)(intptr_t, ...) );
 void	Sys_UnloadDll( void *dllHandle );
 
diff --git a/code/qcommon/vm.c b/code/qcommon/vm.c
index 2ccc24f7..fa92305c 100644
--- a/code/qcommon/vm.c
+++ b/code/qcommon/vm.c
@@ -556,7 +556,7 @@ vm_t *VM_Create( const char *module, intptr_t (*systemCalls)(intptr_t *),
 	if ( interpret == VMI_NATIVE ) {
 		// try to load as a system dll
 		Com_Printf( "Loading dll file %s.\n", vm->name );
-		vm->dllHandle = Sys_LoadDll( module, vm->fqpath , &vm->entryPoint, VM_DllSyscall );
+		vm->dllHandle = Sys_LoadDll( module, &vm->entryPoint, VM_DllSyscall );
 		if ( vm->dllHandle ) {
 			return vm;
 		}
diff --git a/code/qcommon/vm_local.h b/code/qcommon/vm_local.h
index 89127710..f6db7017 100644
--- a/code/qcommon/vm_local.h
+++ b/code/qcommon/vm_local.h
@@ -168,8 +168,6 @@ struct vm_s {
 	int			breakFunction;		// increment breakCount on function entry to this
 	int			breakCount;
 
-	char		fqpath[MAX_QPATH+1] ;
-
 	byte		*jumpTableTargets;
 	int			numJumpTableTargets;
 };
diff --git a/code/sys/sys_main.c b/code/sys/sys_main.c
index 65dff8b0..6d9cfea8 100644
--- a/code/sys/sys_main.c
+++ b/code/sys/sys_main.c
@@ -414,7 +414,7 @@ Used to load a development dll instead of a virtual machine
 #2 look in fs_basepath
 =================
 */
-void *Sys_LoadDll( const char *name, char *fqpath ,
+void *Sys_LoadDll( const char *name,
 	intptr_t (**entryPoint)(int, ...),
 	intptr_t (*systemcalls)(intptr_t, ...) )
 {