diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_pmove.c | 5 | ||||
| -rw-r--r-- | src/game/g_buildable.c | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 7e0c9106..276aa428 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -1656,12 +1656,15 @@ static void PM_GroundTrace( void ) { if( pm->cmd.upmove < 0 && wcl[ pm->ps->clientNum ].lastUpmove >= 0 ) { - if( !pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING && pm->cmd.upmove < 0 ) + if( !( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING ) && pm->cmd.upmove < 0 ) pm->ps->stats[ STAT_STATE ] |= SS_WALLCLIMBING; else if( pm->ps->stats[ STAT_STATE ] & SS_WALLCLIMBING && pm->cmd.upmove < 0 ) pm->ps->stats[ STAT_STATE ] &= ~SS_WALLCLIMBING; } + if( pm->ps->pm_type == PM_DEAD ) + pm->ps->stats[ STAT_STATE ] &= ~SS_WALLCLIMBING; + wcl[ pm->ps->clientNum ].lastUpmove = pm->cmd.upmove; //if( BG_ClassHasAbility( pm->ps->stats[ STAT_PCLASS ], SCA_WALLCLIMBER ) && ( pm->cmd.upmove < 0 ) ) diff --git a/src/game/g_buildable.c b/src/game/g_buildable.c index d55e599c..e5ed7791 100644 --- a/src/game/g_buildable.c +++ b/src/game/g_buildable.c @@ -345,12 +345,12 @@ void HMCU_Think( gentity_t *self ) // "fuzzysteve" (fuzzysteve@quakefiles.com) and // Anthony "inolen" Pesch (www.inolen.com) //with modifications by me of course :) -#define HDEF1_RANGE 500 -#define HDEF1_ANGULARSPEED 15 -#define HDEF1_FIRINGSPEED 200 -#define HDEF1_ACCURACYTOLERANCE HDEF1_ANGULARSPEED - 5 -#define HDEF1_VERTICALCAP 20 -#define HDEF1_PROJSPEED 2000.0f +#define HDEF1_RANGE 500 //maximum range +#define HDEF1_ANGULARSPEED 10 //degrees/think ~= 200deg/sec +#define HDEF1_FIRINGSPEED 500 //time between projectiles +#define HDEF1_ACCURACYTOLERANCE HDEF1_ANGULARSPEED / 2 //angular difference for turret to fire +#define HDEF1_VERTICALCAP 20 //+/- maximum pitch +#define HDEF1_PROJSPEED 2000.0f //speed of projectile (used in prediction) /* ================ @@ -393,7 +393,7 @@ qboolean hdef1_trackenemy( gentity_t *self ) VectorSubtract( dirToTarget, self->s.pos.trBase, dirToTarget ); distanceToTarget = VectorLength( dirToTarget ); - distanceToTarget -= ( self->r.maxs[ 0 ] + self->enemy->r.maxs[ 0 ] ); + distanceToTarget -= self->enemy->r.maxs[ 0 ]; } VectorNormalize( dirToTarget ); |