rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-15 01:01:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

SSG Zooming final tweak

Browse source
This commit is contained in:
Daniel Simoes 2002-06-12 23:05:14 +00:00
parent 2c05286fe8
commit d0c82c352d
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.93 2002/06/12 23:05:14 slicer
// SSG Zooming final tweak
//
// Revision 1.92 2002/06/12 22:31:59 slicer // Revision 1.92 2002/06/12 22:31:59 slicer
// Even better way to improve the Cvar Anti-Cheat System // Even better way to improve the Cvar Anti-Cheat System
// //
@ -792,7 +795,7 @@ typedef struct {
vec3_t refdefViewAngles; // will be converted to refdef.viewaxis vec3_t refdefViewAngles; // will be converted to refdef.viewaxis
// zoom key // zoom key
qboolean zooming; //Slicer: flag to determine when to set zoomTime
qboolean zoomed; // Determines first-person weapon drawing qboolean zoomed; // Determines first-person weapon drawing
int zoomLevel; // Zoom LEVEL! -- uses zoom bits like STAT_RQ3 int zoomLevel; // Zoom LEVEL! -- uses zoom bits like STAT_RQ3
int lastZoomLevel; // Save last zoom state int lastZoomLevel; // Save last zoom state

12
reaction/cgame/cg_view.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.22 2002/06/12 23:01:06 slicer
// SSG Zooming final tweak
//
// Revision 1.21 2002/05/23 15:54:35 makro // Revision 1.21 2002/05/23 15:54:35 makro
// cg_RQ3_avidemo tweak // cg_RQ3_avidemo tweak
// //
@ -740,6 +743,12 @@ static int CG_CalcFov( void ) {
//switching zoom //switching zoom
if (cg.zoomLevel != cg.lastZoomLevel) if (cg.zoomLevel != cg.lastZoomLevel)
{ {
//Slicer
if(!cg.zooming) { // If this is the first zooming attempt
cg.zoomTime = cg.time; // Lets set the time
cg.zooming = qtrue; // and disable the IF condition
}
fov_x = CG_RQ3_GetLastFov(); fov_x = CG_RQ3_GetLastFov();
//Get desired zoom FOV based on current FOV //Get desired zoom FOV based on current FOV
if (cg.zoomLevel == 0) if (cg.zoomLevel == 0)
@ -777,6 +786,8 @@ static int CG_CalcFov( void ) {
//finished zoom switch //finished zoom switch
cg.lastZoomLevel = cg.zoomLevel; cg.lastZoomLevel = cg.zoomLevel;
fov_x = zoomFov; fov_x = zoomFov;
//Slicer : zoom has finished, so the next one needs to have a new zoomTime
cg.zooming = qfalse;
} }
else else
fov_x = fov_x + f * ( zoomFov - fov_x ); fov_x = fov_x + f * ( zoomFov - fov_x );
@ -867,6 +878,7 @@ static int CG_CalcFov( void ) {
else else
fov_x = fov_x + f * ( zoomFov - fov_x ); fov_x = fov_x + f * ( zoomFov - fov_x );
} }
} }
//Using anything but the SSG3000 //Using anything but the SSG3000
else else