[quake3-commits] r1874 - in trunk/code: cgame game qcommon sys

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-02-08 13:19:31 -0500 (Tue, 08 Feb 2011)
New Revision: 1874

Modified:
   trunk/code/cgame/cg_local.h
   trunk/code/cgame/cg_view.c
   trunk/code/game/bg_local.h
   trunk/code/game/bg_pmove.c
   trunk/code/qcommon/qcommon.h
   trunk/code/qcommon/vm.c
   trunk/code/qcommon/vm_local.h
   trunk/code/sys/sys_main.c
Log:
Code cleanup patch by devhc



Modified: trunk/code/cgame/cg_local.h
===================================================================
--- trunk/code/cgame/cg_local.h	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/cgame/cg_local.h	2011-02-08 18:19:31 UTC (rev 1874)
@@ -628,9 +628,6 @@
 	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;

Modified: trunk/code/cgame/cg_view.c
===================================================================
--- trunk/code/cgame/cg_view.c	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/cgame/cg_view.c	2011-02-08 18:19:31 UTC (rev 1874)
@@ -335,9 +335,6 @@
 		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 @@
 	// add step offset
 	CG_StepOffset();
 
-	// add kick offset
-
-	VectorAdd (origin, cg.kick_origin, origin);
-
 	// pivot the eye based on a neck length
 #if 0
 	{

Modified: trunk/code/game/bg_local.h
===================================================================
--- trunk/code/game/bg_local.h	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/game/bg_local.h	2011-02-08 18:19:31 UTC (rev 1874)
@@ -60,7 +60,6 @@
 extern	float	pm_stopspeed;
 extern	float	pm_duckScale;
 extern	float	pm_swimScale;
-extern	float	pm_wadeScale;
 
 extern	float	pm_accelerate;
 extern	float	pm_airaccelerate;

Modified: trunk/code/game/bg_pmove.c
===================================================================
--- trunk/code/game/bg_pmove.c	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/game/bg_pmove.c	2011-02-08 18:19:31 UTC (rev 1874)
@@ -34,7 +34,6 @@
 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;

Modified: trunk/code/qcommon/qcommon.h
===================================================================
--- trunk/code/qcommon/qcommon.h	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/qcommon/qcommon.h	2011-02-08 18:19:31 UTC (rev 1874)
@@ -1036,7 +1036,7 @@
 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 );
 

Modified: trunk/code/qcommon/vm.c
===================================================================
--- trunk/code/qcommon/vm.c	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/qcommon/vm.c	2011-02-08 18:19:31 UTC (rev 1874)
@@ -556,7 +556,7 @@
 	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;
 		}

Modified: trunk/code/qcommon/vm_local.h
===================================================================
--- trunk/code/qcommon/vm_local.h	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/qcommon/vm_local.h	2011-02-08 18:19:31 UTC (rev 1874)
@@ -168,8 +168,6 @@
 	int			breakFunction;		// increment breakCount on function entry to this
 	int			breakCount;
 
-	char		fqpath[MAX_QPATH+1] ;
-
 	byte		*jumpTableTargets;
 	int			numJumpTableTargets;
 };

Modified: trunk/code/sys/sys_main.c
===================================================================
--- trunk/code/sys/sys_main.c	2011-02-08 18:06:39 UTC (rev 1873)
+++ trunk/code/sys/sys_main.c	2011-02-08 18:19:31 UTC (rev 1874)
@@ -414,7 +414,7 @@
 #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, ...) )
 {