diff options
| author | Samuel Villareal | 2010-09-04 04:06:10 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-09-04 04:06:10 +0000 |
| commit | 583406a2ba2a10bfe0e654a0ede285da46c9bd88 (patch) | |
| tree | 1451231cce840aafdb8e3a6f10290bac81e40a39 /src/strife/p_map.c | |
| parent | 8761422d31fdceb685b292a780727f3ad1d950db (diff) | |
| download | chocolate-doom-583406a2ba2a10bfe0e654a0ede285da46c9bd88.tar.gz chocolate-doom-583406a2ba2a10bfe0e654a0ede285da46c9bd88.tar.bz2 chocolate-doom-583406a2ba2a10bfe0e654a0ede285da46c9bd88.zip | |
+ Map flags for things added (MTF_*)
+ A_FireGrenade and A_MissileTick codepointers added
+ Step up height changed to 16*FRACUNIT (non-human things are excluded)
+ Fixed bug in P_MovePlayer where player cannot climb over things when
pressing forward and jumping. Missed a line of code for this
+ P_SpawnSubMissile renamed to P_SpawnFaceMissile
+ P_SpawnMortar added
+ Ammo types added
+ Fixed some inaccuracies in P_SpawnBlood
Subversion-branch: /branches/strife-branch
Subversion-revision: 2008
Diffstat (limited to 'src/strife/p_map.c')
| -rw-r--r-- | src/strife/p_map.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/strife/p_map.c b/src/strife/p_map.c index cd289c88..4897d164 100644 --- a/src/strife/p_map.c +++ b/src/strife/p_map.c @@ -530,9 +530,14 @@ P_TryMove &&*/tmceilingz - thing->z < thing->height) return false; // mobj must lower itself to fit - if ( /*!(thing->flags&MF_TELEPORT) // villsa [STRIFE] unused - &&*/ tmfloorz - thing->z > 24*FRACUNIT ) - return false; // too big a step up + // villsa [STRIFE] non-robots are limited to 16 unit step height + if(!(thing->flags & MF_NOBLOOD) && tmfloorz - thing->z > (16*FRACUNIT) || + tmfloorz - thing->z > 24*FRACUNIT) + return false; // too big a step up + + // villsa [STRIFE] special case for missiles + if(thing->flags & MF_MISSILE && tmfloorz - thing->z > (4*FRACUNIT)) + return false; if ( !(thing->flags&(MF_DROPOFF|MF_FLOAT)) && tmfloorz - tmdropoffz > 24*FRACUNIT ) @@ -792,7 +797,8 @@ boolean PTR_SlideTraverse (intercept_t* in) if (opentop - slidemo->z < slidemo->height) goto isblocking; // mobj is too high - if (openbottom - slidemo->z > 24*FRACUNIT ) + // villsa [STRIFE] change from 24 to 16 + if (openbottom - slidemo->z > 16*FRACUNIT ) goto isblocking; // too big a step up // this line doesn't block movement |