OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added an Active and Inactive state for monsters.

Browse source 
- Made the speed a parameter to A_RaiseMobj and A_SinkMobj and deleted
  GetRaiseSpeed and GetSinkSpeed.
- Added some remaining DECORATE conversions for Hexen by Karate Chris.


SVN r1144 (trunk)
This commit is contained in:
Christoph Oelckers 2008-08-10 11:29:19 +00:00
commit 5ea4b37373
22 changed files with 853 additions and 1261 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/p_enemy.cpp
View file

@ -2766,11 +2766,11 @@ int P_Massacre ()
// Sink a mobj incrementally into the floor
//
bool A_SinkMobj (AActor *actor)
bool A_SinkMobj (AActor *actor, fixed_t speed)
{
if (actor->floorclip < actor->height)
{
actor->floorclip += actor->GetSinkSpeed ();
actor->floorclip += speed;
return false;
}
return true;
@ -2781,14 +2781,14 @@ bool A_SinkMobj (AActor *actor)
// Raise a mobj incrementally from the floor to
//
bool A_RaiseMobj (AActor *actor)
bool A_RaiseMobj (AActor *actor, fixed_t speed)
{
bool done = true;
// Raise a mobj from the ground
if (actor->floorclip > 0)
{
actor->floorclip -= actor->GetRaiseSpeed ();
actor->floorclip -= speed;
if (actor->floorclip <= 0)
{
actor->floorclip = 0;