OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- removed the FxDamageValue hack and implemented it properly using FxReturnStatement.

Browse source 
- added handling of damage functions for ZScript.
This commit is contained in:
Christoph Oelckers 2016-10-26 14:04:49 +02:00
commit 7c759f9fcf
8 changed files with 37 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/scripting/thingdef_properties.cpp
View file

@ -647,19 +647,9 @@ DEFINE_PROPERTY(damage, X, Actor)
// compatibility reasons, expressions must be enclosed within
// parentheses.
// Store this expression here for now. It will be converted to a function
// later once all actors have been processed.
defaults->DamageVal = dmgval;
if (id == nullptr)
{
defaults->DamageFunc = nullptr;
}
else
{
auto funcsym = CreateAnonymousFunction(bag.Info, TypeSInt32, VARF_Method);
defaults->DamageFunc = FunctionBuildList.AddFunction(funcsym, id, FStringf("%s.DamageFunction", bag.Info->TypeName.GetChars()), !bag.fromZScript);
}
// Only DECORATE can get here with a valid expression.
CreateDamageFunction(bag.Info, defaults, id, true);
}
//==========================================================================