mirror of
https://github.com/ReactionQuake3/reaction.git
synced 2024-11-11 15:52:30 +00:00
Adjusted some of elder's unzoom code for the new sniper system ( server side )
This commit is contained in:
parent
f312d740b4
commit
a31504605b
5 changed files with 34 additions and 13 deletions
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
|
@ -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();
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 );
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue