OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
- This reverts commit 06216d733e.
- I don't know what I was thinking. Since stateowner is always available
  to the wrapper function, and this code is only generated for the wrapper
  function, it's a nonissue. The state is already located before calling
  any function that uses it.
This commit is contained in:
Randy Heit 2016-04-19 21:09:15 -05:00
commit 60966f472f
8 changed files with 243 additions and 253 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)
if (Call != NULL && Call->GetArgCount() == 0 && (Call->GetFunction()->Flags & VARF_Action))
{
return Call->GetVMFunction();
}