diff options
| author | Paweł Redman <pawel.redman@gmail.com> | 2015-06-26 02:54:21 +0200 |
|---|---|---|
| committer | Paweł Redman <pawel.redman@gmail.com> | 2015-06-26 02:54:21 +0200 |
| commit | 7a9d256ea39e7ed8797801f8184e6ab7f27a21dc (patch) | |
| tree | 60717f0117b2b696693efa0e7070c58ea266cdcf /src/game | |
| parent | b28d5f6dbedd5b895eed4cc5b730581df3b2215d (diff) | |
Bug fixes for Wraith.
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_pmove.c | 11 | ||||
| -rw-r--r-- | src/game/tremulous.h | 7 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 78bc15a..1e1fb69 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -2625,8 +2625,7 @@ static void PM_Footsteps( void ) pm->xyspeed = sqrt( pm->ps->velocity[ 0 ] * pm->ps->velocity[ 0 ] + pm->ps->velocity[ 1 ] * pm->ps->velocity[ 1 ] ); - if( pm->ps->groundEntityNum == ENTITYNUM_NONE || - ( pm->ps->eFlags & EF_WARPING ) ) + if( pm->ps->groundEntityNum == ENTITYNUM_NONE ) { // airborne leaves position in cycle intact, but doesn't advance if( pm->waterlevel > 1 ) @@ -3808,6 +3807,11 @@ void PM_ForceFields( void ) forceField_t *ff; vec3_t total = { 0 }; + if( pm->ps->eFlags & EF_WARPING ) + { + return; + } + for( i = 0; i < pm->numForceFields; i++ ) { vec3_t delta; @@ -3869,6 +3873,7 @@ void PM_WraithMechanics( void ) { pm->ps->eFlags |= EF_WARPING; PM_AddEvent( EV_WARP_ENTER ); + pm->ps->stats[ STAT_MISC ] -= LEVEL1_WARP_COST; } else { @@ -3902,12 +3907,10 @@ done: { pm->tracemask = MASK_SOLID; pm->ps->stats[ STAT_MISC ] -= pml.msec; - pm->ps->eFlags |= EF_NODRAW; } else { pm->tracemask = MASK_PLAYERSOLID; - pm->ps->eFlags &= ~EF_NODRAW; } } diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 92bf74e..84d8a27 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -127,8 +127,8 @@ TREMULOUS EDGE MOD SRC FILE //Wraith #define LEVEL1_SPEED 1.25f -#define LEVEL1_VALUE AVM(270) -#define LEVEL1_HEALTH AHM(60) +#define LEVEL1_VALUE AVM(370) +#define LEVEL1_HEALTH AHM(80) #define LEVEL1_REGEN (0.03f * LEVEL1_HEALTH) #define LEVEL1_COST 1 @@ -139,9 +139,10 @@ TREMULOUS EDGE MOD SRC FILE #define LEVEL1_CLAW_REPEAT 600 #define LEVEL1_CLAW_K_SCALE 1.0f -#define LEVEL1_WARP_TIME 5000 +#define LEVEL1_WARP_TIME 5500 #define LEVEL1_WARP_REGEN_DELAY 2000 #define LEVEL1_WARP_REGEN_RATE 1 +#define LEVEL1_WARP_COST 500 //Marauder #define LEVEL2_SPEED 1.2f |