OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- converted some Heretic stuff to ZScript for testing.

Browse source 
- added type casts to the arguments of function calls.
- added string constant to state conversion to FxTypeCast.
This commit is contained in:
Christoph Oelckers 2016-10-16 22:32:52 +02:00
commit 6650e2bbfb
21 changed files with 1438 additions and 1144 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/codegeneration/codegen.h
View file

@ -174,6 +174,7 @@ struct ExpVal
FName GetName() const
{
if (Type == TypeString) return FName(*(FString *)&pointer);
return Type == TypeName ? ENamedName(Int) : NAME_None;
}
};
@ -338,8 +339,9 @@ public:
FxConstant(PClass *val, const FScriptPosition &pos) : FxExpression(pos)
{
value.pointer = (void*)val;
ValueType = val;
value.Type = NewClassPointer(RUNTIME_CLASS(AActor));
if (val != nullptr) ValueType = NewClassPointer(val);
else ValueType = NewClassPointer(RUNTIME_CLASS(DObject));
value.Type = NewClassPointer(RUNTIME_CLASS(DObject));
isresolved = true;
}