diff options
| author | Asa Kravets <norfenstein@gmail.com> | 2009-10-03 11:34:33 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:08 +0000 |
| commit | a2e8bf07111221a6dfa6bcbca33956a64fa427e0 (patch) | |
| tree | b1c43cdf2ced2736a4efb15cdd02d871666fc4b8 /src | |
| parent | c2976bbd67c68fc208924551b0cf20198b602124 (diff) | |
* Unreverted entity walljumping
* Pulse rifle shots have a volume of 4 cubed
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/bg_pmove.c | 4 | ||||
| -rw-r--r-- | src/game/g_missile.c | 2 | ||||
| -rw-r--r-- | src/game/tremulous.h | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index ee800910..e1129dcf 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -2229,8 +2229,8 @@ static void PM_GroundTrace( void ) VectorMA( pm->ps->origin, 0.25f, movedir, point ); pm->trace( &trace, pm->ps->origin, pm->mins, pm->maxs, point, pm->ps->clientNum, pm->tracemask ); - if( trace.fraction < 1.0f && !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) && - ( trace.entityNum == ENTITYNUM_WORLD ) ) + if( trace.fraction < 1.0f && + !( trace.surfaceFlags & ( SURF_SKY | SURF_SLICK ) ) ) { if( !VectorCompare( trace.plane.normal, pm->ps->grapplePoint ) ) { diff --git a/src/game/g_missile.c b/src/game/g_missile.c index 642a7fd7..6f8ee995 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -414,6 +414,8 @@ gentity_t *fire_pulseRifle( gentity_t *self, vec3_t start, vec3_t dir ) bolt->splashMethodOfDeath = MOD_PRIFLE; bolt->clipmask = MASK_SHOT; bolt->target_ent = NULL; + bolt->r.mins[ 0 ] = bolt->r.mins[ 1 ] = bolt->r.mins[ 2 ] = -PRIFLE_SIZE; + bolt->r.maxs[ 0 ] = bolt->r.maxs[ 1 ] = bolt->r.maxs[ 2 ] = PRIFLE_SIZE; bolt->s.pos.trType = TR_LINEAR; bolt->s.pos.trTime = level.time - MISSILE_PRESTEP_TIME; // move a bit on the very first frame diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 47049842..9d397268 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -438,6 +438,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define PRIFLE_RELOAD 2000 #define PRIFLE_DMG HDM(9) #define PRIFLE_SPEED 1200 +#define PRIFLE_SIZE 4 #define FLAMER_PRICE 450 #define FLAMER_GAS 150 |