diff --git a/src/thingdef/thingdef_exp.h b/src/thingdef/thingdef_exp.h index 239c2ad886..9097e1ffc2 100644 --- a/src/thingdef/thingdef_exp.h +++ b/src/thingdef/thingdef_exp.h @@ -62,13 +62,11 @@ struct FCompileContext { PClassActor *cls; bool lax; - bool isconst; - FCompileContext(PClassActor *_cls = NULL, bool _lax = false, bool _isconst = false) + FCompileContext(PClassActor *_cls = NULL, bool _lax = false) { cls = _cls; lax = _lax; - isconst = _isconst; } PSymbol *FindInClass(FName identifier) diff --git a/src/thingdef/thingdef_parse.cpp b/src/thingdef/thingdef_parse.cpp index 23d7fd00a2..0ac87bb359 100644 --- a/src/thingdef/thingdef_parse.cpp +++ b/src/thingdef/thingdef_parse.cpp @@ -208,7 +208,7 @@ static void ParseConstant (FScanner &sc, PSymbolTable *symt, PClassActor *cls) FxExpression *expr = ParseExpression (sc, cls); sc.MustGetToken(';'); - FCompileContext ctx(cls, true, true); + FCompileContext ctx(cls, true); expr = expr->Resolve(ctx); if (!expr->isConstant()) { @@ -266,7 +266,7 @@ static void ParseEnum (FScanner &sc, PSymbolTable *symt, PClassActor *cls) if (sc.CheckToken('=')) { FxExpression *expr = ParseExpression (sc, cls); - FCompileContext ctx(cls, true, true); + FCompileContext ctx(cls, true); expr = expr->Resolve(ctx); if (!expr->isConstant()) { @@ -355,7 +355,7 @@ static void ParseNativeVariable (FScanner &sc, PSymbolTable *symt, PClassActor * if (sc.CheckToken('[')) { FxExpression *expr = ParseExpression (sc, cls); - FCompileContext ctx(cls, true, true); + FCompileContext ctx(cls, true); expr = expr->Resolve(ctx); if (!expr->isConstant()) { @@ -428,7 +428,7 @@ static void ParseUserVariable (FScanner &sc, PSymbolTable *symt, PClassActor *cl if (sc.CheckToken('[')) { FxExpression *expr = ParseExpression(sc, cls); - FCompileContext ctx(cls, true, true); + FCompileContext ctx(cls, true); int maxelems; expr = expr->Resolve(ctx); if (!expr->isConstant())