OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'slowstate' of https://github.com/Gaerzi/zdoom

Browse source
This commit is contained in:
Christoph Oelckers 2014-04-18 09:46:23 +02:00
commit 7cb828d763
12 changed files with 59 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/p_mobj.cpp
View file

@ -405,7 +405,7 @@ bool AActor::InStateSequence(FState * newstate, FState * basestate)
//
// Get the actual duration of the next state
// We are using a state flag now to indicate a state that should be
// accelerated in Fast mode.
// accelerated in Fast mode or slowed in Slow mode.
//
//==========================================================================
@ -416,6 +416,10 @@ int AActor::GetTics(FState * newstate)
{
return tics - (tics>>1);
}
else if (isSlow() && newstate->Slow)
{
return tics<<1;
}
return tics;
}
@ -4082,6 +4086,11 @@ bool AActor::isFast()
return !!G_SkillProperty(SKILLP_FastMonsters);
}
bool AActor::isSlow()
{
return !!G_SkillProperty(SKILLP_SlowMonsters);
}
void AActor::Activate (AActor *activator)
{
if ((flags3 & MF3_ISMONSTER) && (health > 0 || (flags & MF_ICECORPSE)))