OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Simplify NoDelay implementation

Browse source 
- All NoDelay needs to do is call the current state's function. Calling
  SetState() is excessive.
This commit is contained in:
Randy Heit 2015-02-24 20:37:58 -06:00
commit 5aba252b87
2 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/p_mobj.cpp
View file

@ -3673,17 +3673,9 @@ void AActor::Tick ()
if (state->GetNoDelay())
{
// For immediately spawned objects with the NoDelay flag set for their
// Spawn state, explicitly set the current state so that it calls its
// action and chains 0-tic states.
int starttics = tics;
if (!SetState(state))
// Spawn state, explicitly call the current state's function.
if (state->CallAction(this, this) && (ObjectFlags & OF_EuthanizeMe))
return; // freed itself
// If the initial state had a duration of 0 tics, let the next state run
// normally. Otherwise, increment tics by 1 so that we don't double up ticks.
else if (starttics > 0 && tics >= 0)
{
tics++;
}
}
}
// cycle through states, calling action functions at transitions