diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 13:11:36 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:16:32 +0000 |
| commit | 79b48fc1d21e3863a0168a426a63779e81104f7a (patch) | |
| tree | 08b235757356ca5f0031361a14c430abfd3ff00c /src/cgame | |
| parent | 73dc033ecade830d30a15a818508fa160346aeb5 (diff) | |
* make poison cloud disorientation start/end more smoothly
* add /give gas for testing
Diffstat (limited to 'src/cgame')
| -rw-r--r-- | src/cgame/cg_view.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/cgame/cg_view.c b/src/cgame/cg_view.c index 5460938f..c60695b0 100644 --- a/src/cgame/cg_view.c +++ b/src/cgame/cg_view.c @@ -546,7 +546,7 @@ static void CG_StepOffset( void ) #define PCLOUD_ROLL_AMPLITUDE 25.0f #define PCLOUD_ROLL_FREQUENCY 0.4f #define PCLOUD_ZOOM_AMPLITUDE 15 -#define PCLOUD_ZOOM_FREQUENCY 0.7f +#define PCLOUD_ZOOM_FREQUENCY 0.625f // 2.5s / 4 #define PCLOUD_DISORIENT_DURATION 2500 @@ -765,8 +765,10 @@ void CG_OffsetFirstPersonView( void ) BG_PlayerPoisonCloudTime( &cg.predictedPlayerState ); if( scale < 0.0f ) scale = 0.0f; - fraction = sin( cg.time / 500.0f * M_PI * PCLOUD_ROLL_FREQUENCY ) * scale; - pitchFraction = sin( cg.time / 200.0f * M_PI * PCLOUD_ROLL_FREQUENCY ) * + + fraction = sin( ( cg.time - cg.poisonedTime ) / 500.0f * M_PI * PCLOUD_ROLL_FREQUENCY ) * + scale; + pitchFraction = sin( ( cg.time - cg.poisonedTime ) / 200.0f * M_PI * PCLOUD_ROLL_FREQUENCY ) * scale; angles[ ROLL ] += fraction * PCLOUD_ROLL_AMPLITUDE; @@ -991,7 +993,7 @@ static int CG_CalcFov( void ) float scale = 1.0f - (float)( cg.time - cg.poisonedTime ) / BG_PlayerPoisonCloudTime( &cg.predictedPlayerState ); - phase = cg.time / 1000.0 * PCLOUD_ZOOM_FREQUENCY * M_PI * 2; + phase = ( cg.time - cg.poisonedTime ) / 1000.0 * PCLOUD_ZOOM_FREQUENCY * M_PI * 2; v = PCLOUD_ZOOM_AMPLITUDE * sin( phase ) * scale; fov_x += v; fov_y += v; |