diff options
| author | Samuel Villareal | 2010-09-01 05:44:46 +0000 |
|---|---|---|
| committer | Samuel Villareal | 2010-09-01 05:44:46 +0000 |
| commit | 0896e8f879ab0cb133c27eb6ad5b23e167205bf7 (patch) | |
| tree | 634e92a99e8ff4280a1421f2f98bba6dc954c9ba /src/strife/p_enemy.c | |
| parent | b10d4acc24278460fc357aa974d7e3e56f0d5953 (diff) | |
| download | chocolate-doom-0896e8f879ab0cb133c27eb6ad5b23e167205bf7.tar.gz chocolate-doom-0896e8f879ab0cb133c27eb6ad5b23e167205bf7.tar.bz2 chocolate-doom-0896e8f879ab0cb133c27eb6ad5b23e167205bf7.zip | |
+ Terrain type system implemented
+ Feet clipping support added (drawing and player viewz) (TODO: Need
FeetClipping support done for P_ZMovement)
Subversion-branch: /branches/strife-branch
Subversion-revision: 1992
Diffstat (limited to 'src/strife/p_enemy.c')
| -rw-r--r-- | src/strife/p_enemy.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/strife/p_enemy.c b/src/strife/p_enemy.c index a96d8557..acae8479 100644 --- a/src/strife/p_enemy.c +++ b/src/strife/p_enemy.c @@ -329,12 +329,18 @@ boolean P_Move (mobj_t* actor) } else { - actor->flags &= ~MF_INFLOAT; + actor->flags &= ~(MF_INFLOAT|MF_FEETCLIPPED); // villsa [STRIFE] + + // villsa [STRIFE] + if(P_GetTerrainType(actor) != FLOOR_SOLID) + actor->flags |= MF_FEETCLIPPED; } - - if (! (actor->flags & MF_FLOAT) ) - actor->z = actor->floorz; + + // villsa [STRIFE] TODO - verify + /*if (! (actor->flags & MF_FLOAT) ) + actor->z = actor->floorz;*/ + return true; } |