OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Revert "Remove "action" from Actor functions that don't actually need it"

Browse source 
- This reverts commit 39df62b20e.
- Anything that needs to lookup a state also needs stateowner. See
  FxMultiNameState::Emit(). I will need to be more selective when
  de-actionifying functions.
This commit is contained in:
Randy Heit 2016-04-19 20:56:43 -05:00
commit 06216d733e
8 changed files with 253 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/thingdef/thingdef_expression.cpp
View file

@ -3844,7 +3844,7 @@ VMFunction *FxReturnStatement::GetDirectFunction()
// then it can be a "direct" function. That is, the DECORATE
// definition can call that function directly without wrapping
// it inside VM code.
if (Call != NULL && Call->GetArgCount() == 0 && (Call->GetFunction()->Flags & VARF_Action))
if (Call != NULL && Call->GetArgCount() == 0)
{
return Call->GetVMFunction();
}