From e50315bd31bde9ed3f1040ed453b7bbce2bbd943 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 26 Oct 2016 13:22:36 +0200 Subject: [PATCH] - fixed: Deprecation messages should never appear in DECORATE. - removed some console message spam. --- src/d_dehacked.cpp | 7 ++++--- src/scripting/codegeneration/codegen.cpp | 2 +- src/scripting/thingdef.cpp | 2 ++ src/scripting/zscript/zcc_compile.cpp | 2 -- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/d_dehacked.cpp b/src/d_dehacked.cpp index 97d15e4d0..064f37c02 100644 --- a/src/d_dehacked.cpp +++ b/src/d_dehacked.cpp @@ -73,6 +73,7 @@ #include "vm.h" #include "thingdef.h" #include "info.h" +#include "v_text.h" #include "vmbuilder.h" // [SO] Just the way Randy said to do it :) @@ -2108,7 +2109,7 @@ static int PatchCodePtrs (int dummy) if (!symname.CompareNoCase(MBFCodePointers[i].alias)) { symname = MBFCodePointers[i].name; - Printf("%s --> %s\n", MBFCodePointers[i].alias, MBFCodePointers[i].name.GetChars()); + DPrintf(DMSG_SPAMMY, "%s --> %s\n", MBFCodePointers[i].alias, MBFCodePointers[i].name.GetChars()); } } @@ -2117,7 +2118,7 @@ static int PatchCodePtrs (int dummy) PFunction *sym = dyn_cast(RUNTIME_CLASS(AStateProvider)->Symbols.FindSymbol(symname, true)); if (sym == NULL) { - Printf("Frame %d: Unknown code pointer '%s'\n", frame, Line2); + Printf(TEXTCOLOR_RED "Frame %d: Unknown code pointer '%s'\n", frame, Line2); } else { @@ -2125,7 +2126,7 @@ static int PatchCodePtrs (int dummy) unsigned numargs = sym->GetImplicitArgs(); if ((sym->Variants[0].Flags & VARF_Virtual || (args.Size() > numargs && !(args[numargs] & VARF_Optional)))) { - Printf("Frame %d: Incompatible code pointer '%s'\n", frame, Line2); + Printf(TEXTCOLOR_RED "Frame %d: Incompatible code pointer '%s'\n", frame, Line2); sym = NULL; } } diff --git a/src/scripting/codegeneration/codegen.cpp b/src/scripting/codegeneration/codegen.cpp index 8fec40113..aaa6888e6 100644 --- a/src/scripting/codegeneration/codegen.cpp +++ b/src/scripting/codegeneration/codegen.cpp @@ -4198,7 +4198,7 @@ FxExpression *FxIdentifier::Resolve(FCompileContext& ctx) // 2. This is a static function // 3. This is an action function with a restricted self pointer // 4. This is a normal member or unrestricted action function. - if (vsym->Flags & VARF_Deprecated) + if ((vsym->Flags & VARF_Deprecated) && !ctx.FromDecorate) { ScriptPosition.Message(MSG_WARNING, "Accessing deprecated member variable %s", sym->SymbolName.GetChars()); } diff --git a/src/scripting/thingdef.cpp b/src/scripting/thingdef.cpp index 2798ab633..183c3f69e 100644 --- a/src/scripting/thingdef.cpp +++ b/src/scripting/thingdef.cpp @@ -202,8 +202,10 @@ void LoadActors () FScriptPosition::ResetErrorCounter(); InitThingdef(); + FScriptPosition::StrictErrors = true; ParseScripts(); + FScriptPosition::StrictErrors = false; ParseAllDecorate(); FunctionBuildList.Build(); diff --git a/src/scripting/zscript/zcc_compile.cpp b/src/scripting/zscript/zcc_compile.cpp index 340a77703..afc74e75e 100644 --- a/src/scripting/zscript/zcc_compile.cpp +++ b/src/scripting/zscript/zcc_compile.cpp @@ -1901,7 +1901,6 @@ void ZCCCompiler::InitDefaults() bag.CurrentState = 0; bag.Lumpnum = c->cls->SourceLump; bag.DropItemList = nullptr; - bag.ScriptPosition.StrictErrors = true; // The actual script position needs to be set per property. for (auto d : c->Defaults) @@ -2425,7 +2424,6 @@ FxExpression *ZCCCompiler::ConvertNode(ZCC_TreeNode *ast) case AST_ExprMemberAccess: { auto ema = static_cast(fcall->Function); - Printf("Member call to %s\n", FName(ema->Right).GetChars()); return new FxMemberFunctionCall(ConvertNode(ema->Left), ema->Right, ConvertNodeList(fcall->Parameters), *ast); }