rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-01-22 09:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed Sniper code and Cam code

Browse source
This commit is contained in:
Daniel Simoes 2002-02-23 18:07:46 +00:00
parent 05eeb448ce
commit 50d0af18a4
4 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reaction/cgame/cg_draw.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.20 2002/02/23 18:07:46 slicer
// Changed Sniper code and Cam code
//
// Revision 1.19 2002/01/11 20:20:57 jbravo // Revision 1.19 2002/01/11 20:20:57 jbravo
// Adding TP to main branch // Adding TP to main branch
// //
@ -2083,8 +2086,8 @@ static void CG_DrawCrosshair(void) {
if ( !cg_drawCrosshair.integer ) { if ( !cg_drawCrosshair.integer ) {
return; return;
} }
//Slicer: Adding Crosshair to FOLLOW SPECS
if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR) { if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR && !(cg.snap->ps.pm_flags & PMF_FOLLOW)) {
return; return;
} }
@ -2747,7 +2750,8 @@ static void CG_Draw2D( void ) {
return; return;
} }
*/ */
if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) { //Slicer: Adding HUD for follow spectating
if ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR && !(cg.snap->ps.pm_flags & PMF_FOLLOW) ) {
CG_DrawSpectator(); CG_DrawSpectator();
CG_DrawCrosshair(); CG_DrawCrosshair();
CG_DrawCrosshairNames(); CG_DrawCrosshairNames();

7
reaction/cgame/cg_view.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.18 2002/02/23 18:07:46 slicer
// Changed Sniper code and Cam code
//
// Revision 1.17 2002/01/12 20:00:49 hal9000 // Revision 1.17 2002/01/12 20:00:49 hal9000
// Fixed a few more instances of strcmp(blah,NULL) // Fixed a few more instances of strcmp(blah,NULL)
// //
@ -587,7 +590,8 @@ static int CG_CalcFov( void ) {
// account for zooms // account for zooms
// zoomFov = cg_zoomFov.value; // zoomFov = cg_zoomFov.value;
*/ */
if (cg_RQ3_ssgZoomAssist.integer == 0) //Slicer - Let's always do a SyncZoom
// if (cg_RQ3_ssgZoomAssist.integer == 0)
CG_RQ3_SyncZoom(); CG_RQ3_SyncZoom();
//SSG3000 zoom handling //SSG3000 zoom handling
@ -721,6 +725,7 @@ static int CG_CalcFov( void ) {
} }
} }
*/ */
if ( cg.snap->ps.weapon == WP_SSG3000) if ( cg.snap->ps.weapon == WP_SSG3000)
{ {
//switching zoom //switching zoom

12
reaction/cgame/cg_weapons.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.49 2002/02/23 18:07:46 slicer
// Changed Sniper code and Cam code
//
// Revision 1.48 2002/02/08 18:00:34 jbravo // Revision 1.48 2002/02/08 18:00:34 jbravo
// Fixing "No newline at end of file" Warnings Linux keeps giving me // Fixing "No newline at end of file" Warnings Linux keeps giving me
// //
@ -2358,9 +2361,16 @@ void CG_Weapon_f( void ) {
} }
if (cg.snap->ps.weapon == WP_SSG3000) { if (cg.snap->ps.weapon == WP_SSG3000) {
trap_S_StartLocalSound( cgs.media.lensSound, CHAN_ITEM); //Slicer- Changing Sniper stuff- some to game.
/* trap_S_StartLocalSound( cgs.media.lensSound, CHAN_ITEM);
if (cg_RQ3_ssgZoomAssist.integer) if (cg_RQ3_ssgZoomAssist.integer)
CG_RQ3_Zoom(); CG_RQ3_Zoom();
*/
//Let's sound it..
trap_S_StartLocalSound( cgs.media.lensSound, CHAN_ITEM);
//Save the time..
cg.zoomTime = cg.time;
} }
else if (cg.snap->ps.weapon == WP_GRENADE) else if (cg.snap->ps.weapon == WP_GRENADE)
{ {

5
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.53 2002/02/23 18:07:18 slicer
// Changed Sniper code and Cam code
//
// Revision 1.52 2002/02/22 02:13:13 jbravo // Revision 1.52 2002/02/22 02:13:13 jbravo
// Fixed a few bugs and did some cleanups // Fixed a few bugs and did some cleanups
// //
@ -799,6 +802,8 @@ void StopFollowing( gentity_t *ent ) {
ent->client->ps.persistant[ PERS_TEAM ] = TEAM_SPECTATOR; ent->client->ps.persistant[ PERS_TEAM ] = TEAM_SPECTATOR;
ent->client->sess.sessionTeam = TEAM_SPECTATOR; ent->client->sess.sessionTeam = TEAM_SPECTATOR;
ent->client->sess.spectatorState = SPECTATOR_FREE; ent->client->sess.spectatorState = SPECTATOR_FREE;
//Slicer - Removing any zoom bits he might have gainned
Cmd_Unzoom(ent);
ent->client->ps.pm_flags &= ~PMF_FOLLOW; ent->client->ps.pm_flags &= ~PMF_FOLLOW;
ent->r.svFlags &= ~SVF_BOT; ent->r.svFlags &= ~SVF_BOT;
ent->client->ps.clientNum = ent - g_entities; ent->client->ps.clientNum = ent - g_entities;