From 1ee916a8c3adf1a2ea0a39b81b9663ea0ee4fec3 Mon Sep 17 00:00:00 2001
From: Victor Chow <elder@rq3.com>
Date: Tue, 13 Nov 2001 05:32:07 +0000
Subject: [PATCH] Elder: 0-19-00 VMs Client-side

---
 reaction/cgame/cg_info.c    | 2 +-
 reaction/cgame/cg_local.h   | 2 +-
 reaction/cgame/cg_main.c    | 8 +++++---
 reaction/cgame/cg_weapons.c | 8 +++++++-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/reaction/cgame/cg_info.c b/reaction/cgame/cg_info.c
index 00e7a00f..ecf9dab4 100644
--- a/reaction/cgame/cg_info.c
+++ b/reaction/cgame/cg_info.c
@@ -201,7 +201,7 @@ void CG_DrawInformation( void ) {
 			//UI_LEFT|UI_SMALLFONT|UI_DROPSHADOW, colorWhite );
 		//Q_strncpyz(buf, s, 1024);
 		//Q_CleanStr(buf);
-		CG_DrawSmallStringColor(x, y, s, colorWhite);
+		CG_DrawSmallStringColor(x, y, s, colorRed);
 		y += SMALLCHAR_HEIGHT;
 	}
 
diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h
index 00ef41e2..f0b2c460 100644
--- a/reaction/cgame/cg_local.h
+++ b/reaction/cgame/cg_local.h
@@ -1314,7 +1314,7 @@ extern	vmCvar_t		cg_blood;
 extern	vmCvar_t		cg_predictItems;
 extern	vmCvar_t		cg_deferPlayers;
 //Blaze: Reaction weapon positions
-extern	vmCvar_t		cg_RQ3_drawWeapon;
+//extern	vmCvar_t		cg_RQ3_drawWeapon;
 //Blaze: how long the glass stays around for
 extern  vmCvar_t		cg_RQ3_glasstime;
 //Elder: muzzle flash toggle
diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c
index 387eb16d..5014ba22 100644
--- a/reaction/cgame/cg_main.c
+++ b/reaction/cgame/cg_main.c
@@ -138,7 +138,8 @@ vmCvar_t	cg_deferPlayers;
 vmCvar_t	cg_drawTeamOverlay;
 vmCvar_t	cg_teamOverlayUserinfo;
 //Blaze: reaction weapon positioning
-vmCvar_t	cg_RQ3_drawWeapon;
+// Elder: removed for now
+//vmCvar_t	cg_RQ3_drawWeapon;
 vmCvar_t	cg_RQ3_glasstime;
 //Elder: muzzle flash toggle
 vmCvar_t	cg_RQ3_flash;
@@ -323,9 +324,10 @@ static cvarTable_t cvarTable[] = { // bk001129
 	{ &cg_smallFont, "ui_smallFont", "0.25", CVAR_ARCHIVE},
 	{ &cg_bigFont, "ui_bigFont", "0.4", CVAR_ARCHIVE},
 	//Blaze: Reaction hand type command
-	{ &cg_RQ3_drawWeapon, "cg_RQ3_drawWeapon", "2", CVAR_ARCHIVE },
+	// Elder: removed
+	//{ &cg_RQ3_drawWeapon, "cg_RQ3_drawWeapon", "2", CVAR_ARCHIVE },
 	{ &cg_RQ3_glasstime, "cg_RQ3_glasstime", "0", CVAR_ARCHIVE },
-	//Elder: added
+	// Elder: added
 	{ &cg_RQ3_flash, "cg_RQ3_flash", "1", CVAR_ARCHIVE },
 	{ &cg_RQ3_painblend, "cg_RQ3_painblend", "1", CVAR_ARCHIVE },
 	{ &cg_RQ3_ssgZoomAssist, "cg_RQ3_ssgZoomAssist", "1", CVAR_ARCHIVE },
diff --git a/reaction/cgame/cg_weapons.c b/reaction/cgame/cg_weapons.c
index 6a94d697..b3940629 100644
--- a/reaction/cgame/cg_weapons.c
+++ b/reaction/cgame/cg_weapons.c
@@ -1731,7 +1731,10 @@ void CG_AddViewWeapon( playerState_t *ps ) {
 	if ( cg.testGun ) {
 		return;
 	}
-//Blaze start: Reaction gun positioning
+
+	// Elder: temporarily removed because we never used it anyways
+	/*
+	//Blaze start: Reaction gun positioning
 	rxn_gunx = cg_gun_x.value;
 	rxn_guny = cg_gun_y.value;
 	rxn_gunz = cg_gun_z.value;
@@ -1751,10 +1754,13 @@ void CG_AddViewWeapon( playerState_t *ps ) {
 		rxn_gunx += 10;
 	}
 
+	
 	if ((cg_RQ3_drawWeapon.integer > 1 ) && (cg_RQ3_drawWeapon.integer < 4 ))
 	{
 		rxn_guny = cg_gun_y.value + 4*(cg_RQ3_drawWeapon.integer-1);
 	}
+	*/
+
 	//Blaze end:
 
 	// drop gun lower at higher fov