From 73ed351144666b6cd8bf96e0a26c498692f5f54f Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 13 Feb 2017 23:24:31 +0100
Subject: [PATCH] - don't error out on unknown CVars for optional parameters in
 menu items.

---
 src/menu/menudef.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/menu/menudef.cpp b/src/menu/menudef.cpp
index 9aff4350a..057f544c5 100644
--- a/src/menu/menudef.cpp
+++ b/src/menu/menudef.cpp
@@ -796,7 +796,10 @@ static void ParseOptionMenuBody(FScanner &sc, DOptionMenuDescriptor *desc)
 							auto cv = FindCVar(sc.String, nullptr);
 							if (cv == nullptr && *sc.String)
 							{
-								sc.ScriptError("Unknown CVar %s", sc.String);
+									if (func->Variants[0].ArgFlags[i] & VARF_Optional)
+										sc.ScriptMessage("Unknown CVar %s", sc.String);
+									else
+										sc.ScriptError("Unknown CVar %s", sc.String);
 							}
 							params.Push(cv);
 						}