diff options
| -rw-r--r-- | src/game/bg_pmove.c | 9 | ||||
| -rw-r--r-- | src/game/g_active.c | 2 | ||||
| -rw-r--r-- | src/game/g_syscalls.c | 2 | ||||
| -rw-r--r-- | src/game/g_weapon.c | 6 |
4 files changed, 12 insertions, 7 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index cb215a3..c78129b 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -51,6 +51,7 @@ float pm_friction = 6.0f; float pm_waterfriction = 1.0f; float pm_flightfriction = 6.0f; float pm_hummelfriction = 2.5f; +float pm_hummelwalkfriction = 8.0f; float pm_spectatorfriction = 5.0f; int c_pmove = 0; @@ -262,7 +263,7 @@ static void PM_Friction( void ) vec3_t vec; float *vel; float speed, newspeed, control; - float drop; + float drop, modifier; vel = pm->ps->velocity; @@ -323,7 +324,10 @@ static void PM_Friction( void ) } */ if( pm->ps->pm_type == PM_HUMMEL /*&& pm->ps->torsoTimer <= 0*/ ) - drop += speed * pm_hummelfriction * pml.frametime; + { + modifier = ( pm->cmd.buttons & BUTTON_WALKING ) ? pm_hummelwalkfriction : pm_hummelfriction; + drop += speed * modifier * pml.frametime; + } // scale the velocity newspeed = speed - drop; @@ -337,7 +341,6 @@ static void PM_Friction( void ) vel[ 2 ] = vel[ 2 ] * newspeed; } - /* ============== PM_Accelerate diff --git a/src/game/g_active.c b/src/game/g_active.c index 3c888a6..af29923 100644 --- a/src/game/g_active.c +++ b/src/game/g_active.c @@ -1754,7 +1754,7 @@ void ClientThink_real( gentity_t *ent ) client->ps.pm_type = PM_GRABBED; else if( BG_InventoryContainsUpgrade( UP_JETPACK, client->ps.stats ) && BG_UpgradeIsActive( UP_JETPACK, client->ps.stats ) ) client->ps.pm_type = PM_JETPACK; - else if( client->ps.weapon == WP_ALEVEL5 /*&& client->buttons & BUTTON_WALKING*/ ) + else if( client->ps.weapon == WP_ALEVEL5 ) //hummel fly client->ps.pm_type = PM_HUMMEL; else diff --git a/src/game/g_syscalls.c b/src/game/g_syscalls.c index 800bd2a..5e4b999 100644 --- a/src/game/g_syscalls.c +++ b/src/game/g_syscalls.c @@ -256,7 +256,7 @@ int trap_RealTime( qtime_t *qtime ) void trap_SnapVector( float *v ) { - syscall( G_SNAPVECTOR, v ); + // syscall( G_SNAPVECTOR, v ); return; } diff --git a/src/game/g_weapon.c b/src/game/g_weapon.c index feee414..0f265db 100644 --- a/src/game/g_weapon.c +++ b/src/game/g_weapon.c @@ -188,6 +188,7 @@ into a wall. */ void SnapVectorTowards( vec3_t v, vec3_t to ) { + /* int i; for( i = 0 ; i < 3 ; i++ ) @@ -197,10 +198,12 @@ void SnapVectorTowards( vec3_t v, vec3_t to ) else v[ i ] = (int)( v[ i ] + ( to[ i ] <= v[ i ] ? -1 : 0 ) ); } + */ } void SnapVectorNormal( vec3_t v, vec3_t normal ) { + /* int i; for( i = 0 ; i < 3 ; i++ ) @@ -210,6 +213,7 @@ void SnapVectorNormal( vec3_t v, vec3_t normal ) else v[ i ] = (int)( v[ i ] + ( normal[ i ] <= 0 ? -1 : 0 ) ); } + */ } /* @@ -1732,8 +1736,6 @@ void Prickles( gentity_t *ent ) vec3_t end; float r; float u; - gentity_t *tent; - gentity_t *traceEnt; r = random( ) * M_PI * 2.0f; u = sin( r ) * crandom( ) * LEVEL5_PRICKLES_SPREAD * 16; |