OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- scriptified a_archvile.cpp.

Browse source 
- fixed the type checks for the conditional operator.
This commit is contained in:
Christoph Oelckers 2016-10-30 18:41:39 +01:00
commit 2857fac338
10 changed files with 120 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/scripting/codegeneration/codegen.cpp
View file

@ -345,6 +345,7 @@ static int EncodeRegType(ExpEmit reg)
else if (reg.RegCount == 2)
{
regtype |= REGT_MULTIREG2;
}
else if (reg.RegCount == 3)
{
@ -3808,7 +3809,7 @@ FxExpression *FxConditional::Resolve(FCompileContext& ctx)
ValueType = TypeVoid;
//else if (truex->ValueType != falsex->ValueType)
if ((!IsNumeric() && !IsPointer() && !IsVector()) || ValueType == TypeVoid)
if (ValueType->GetRegType() == REGT_NIL)
{
ScriptPosition.Message(MSG_ERROR, "Incompatible types for ?: operator");
delete this;