From a31504605bd2d531e5d2734dd868261c173a037c Mon Sep 17 00:00:00 2001 From: Daniel Simoes Date: Wed, 13 Mar 2002 18:41:18 +0000 Subject: [PATCH] Adjusted some of elder's unzoom code for the new sniper system ( server side ) --- reaction/cgame/cg_consolecmds.c | 12 ++++++++---- reaction/cgame/cg_playerstate.c | 8 ++++++-- reaction/cgame/cg_servercmds.c | 6 +++++- reaction/cgame/cg_weapons.c | 16 +++++++++++----- reaction/game/g_cmds.c | 5 ++++- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/reaction/cgame/cg_consolecmds.c b/reaction/cgame/cg_consolecmds.c index e1e4235a..4c80bd77 100644 --- a/reaction/cgame/cg_consolecmds.c +++ b/reaction/cgame/cg_consolecmds.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.31 2002/03/13 18:41:18 slicer +// Adjusted some of elder's unzoom code for the new sniper system ( server side ) +// // Revision 1.30 2002/03/07 00:03:00 assimon // Added some trap_AddComand for ref cvars // @@ -90,8 +93,8 @@ static void CG_DropWeapon_f (void) { CG_Printf("You are too busy bandaging!\n"); return; } - - CG_RQ3_Zoom1x(); +//Slicer: Done Server Side +// CG_RQ3_Zoom1x(); trap_SendClientCommand("dropweapon"); } @@ -168,10 +171,11 @@ static void CG_Bandage_f (void) { //} if (cg.snap->ps.weaponTime > 0 || cg.snap->ps.stats[STAT_RELOADTIME] > 0) return; - - if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_NEED) == RQ3_BANDAGE_NEED) { +//Slicer: Done Server Side +/* if ( (cg.snap->ps.stats[STAT_RQ3] & RQ3_BANDAGE_NEED) == RQ3_BANDAGE_NEED) { CG_RQ3_Zoom1x(); } + */ trap_SendClientCommand("bandage"); } diff --git a/reaction/cgame/cg_playerstate.c b/reaction/cgame/cg_playerstate.c index 3a23f950..2313c861 100644 --- a/reaction/cgame/cg_playerstate.c +++ b/reaction/cgame/cg_playerstate.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.17 2002/03/13 18:41:18 slicer +// Adjusted some of elder's unzoom code for the new sniper system ( server side ) +// // Revision 1.16 2002/01/11 19:48:29 jbravo // Formatted the source in non DOS format. // @@ -257,9 +260,10 @@ void CG_Respawn( void ) { // select the weapon the server says we are using cg.weaponSelect = cg.snap->ps.weapon; - + +//Slicer: Done Server Side //Elder: added to reset zoom stuff LOCALLY - CG_RQ3_Zoom1x(); + //CG_RQ3_Zoom1x(); } diff --git a/reaction/cgame/cg_servercmds.c b/reaction/cgame/cg_servercmds.c index 457da5fa..78390087 100644 --- a/reaction/cgame/cg_servercmds.c +++ b/reaction/cgame/cg_servercmds.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.20 2002/03/13 18:41:18 slicer +// Adjusted some of elder's unzoom code for the new sniper system ( server side ) +// // Revision 1.19 2002/03/03 21:44:01 blaze // weapon stats, done, beta test for bugs // @@ -1230,7 +1233,8 @@ static void CG_ServerCommand( void ) { default: cg.weaponSelectTime = cg.time; cg.weaponSelect = WP_PISTOL; - CG_RQ3_Zoom1x(); + //Slicer: Done Server Side + //CG_RQ3_Zoom1x(); break; } } diff --git a/reaction/cgame/cg_weapons.c b/reaction/cgame/cg_weapons.c index a416cc75..b98d1757 100644 --- a/reaction/cgame/cg_weapons.c +++ b/reaction/cgame/cg_weapons.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.53 2002/03/13 18:41:18 slicer +// Adjusted some of elder's unzoom code for the new sniper system ( server side ) +// // Revision 1.52 2002/03/11 03:25:41 jbravo // Minor fix for NA // @@ -2050,8 +2053,9 @@ void CG_NextWeapon_f( void ) { if ( i == 16 ) { cg.weaponSelect = original; } +//Slicer: Done Server Side else { - CG_RQ3_Zoom1x(); +// CG_RQ3_Zoom1x(); trap_SendClientCommand("unzoom"); } } @@ -2119,7 +2123,8 @@ void CG_PrevWeapon_f( void ) { cg.weaponSelect = original; } else { - CG_RQ3_Zoom1x(); +//Slicer: Done Server Side + //CG_RQ3_Zoom1x(); trap_SendClientCommand("unzoom"); } } @@ -2197,7 +2202,8 @@ void CG_SpecialWeapon_f( void ) { cg.weaponSelect = original; } else { - CG_RQ3_Zoom1x(); +//Slicer: Done Server Side + // CG_RQ3_Zoom1x(); trap_SendClientCommand("unzoom"); } } @@ -2444,8 +2450,8 @@ void CG_Weapon_f( void ) { //cg.zoomed = qfalse; //cg.zoomLevel = 0; - - CG_RQ3_Zoom1x(); +//Slicer : Done Server Side +// CG_RQ3_Zoom1x(); trap_SendClientCommand("unzoom"); cg.weaponSelect = num; } diff --git a/reaction/game/g_cmds.c b/reaction/game/g_cmds.c index b5df41f0..344257d2 100644 --- a/reaction/game/g_cmds.c +++ b/reaction/game/g_cmds.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.69 2002/03/13 18:40:52 slicer +// Adjusted some of elder's unzoom code for the new sniper system ( server side ) +// // Revision 1.68 2002/03/07 19:46:47 jbravo // No dropping weapons or items if bandaging // @@ -2650,7 +2653,7 @@ void Cmd_DropWeapon_f( gentity_t *ent ) { } //Elder: remove zoom bits - //Cmd_Unzoom(ent); + Cmd_Unzoom(ent); //Throwing away return value here; high precedence weapon drop ThrowWeapon( ent, qtrue ); }