From d18a8398368ed759f7e17529f0952edc4c3a0106 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 10 Feb 2016 17:11:50 +0100 Subject: [PATCH] - to prevent further occurences of ValueType == 0 being misinterpreted, change it to signify unknown value type and ensure that any real type is non-zero. --- src/thingdef/thingdef_exp.h | 1 + src/thingdef/thingdef_type.h | 1 + 2 files changed, 2 insertions(+) diff --git a/src/thingdef/thingdef_exp.h b/src/thingdef/thingdef_exp.h index f81dd2b54..8901e35c3 100644 --- a/src/thingdef/thingdef_exp.h +++ b/src/thingdef/thingdef_exp.h @@ -195,6 +195,7 @@ protected: { isresolved = false; ScriptPosition = pos; + ValueType = VAL_Unresolved; } public: virtual ~FxExpression() {} diff --git a/src/thingdef/thingdef_type.h b/src/thingdef/thingdef_type.h index 706b2ba7a..1707a8939 100644 --- a/src/thingdef/thingdef_type.h +++ b/src/thingdef/thingdef_type.h @@ -8,6 +8,7 @@ enum ExpValType { + VAL_Unresolved, // type not yet known VAL_Int, // integer number VAL_Float, // floating point number VAL_Unknown, // nothing