From 78ac944242192813a02169b5073ab959f7357825 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 9 Feb 2016 14:38:42 +0100 Subject: [PATCH] - allow optional terrain definitions ... because any Doom terrain WAD would otherwise spam the logfile with messages when running an error log batch. --- src/p_terrain.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/p_terrain.cpp b/src/p_terrain.cpp index af8de5cab..d30354c1e 100644 --- a/src/p_terrain.cpp +++ b/src/p_terrain.cpp @@ -627,13 +627,19 @@ static void ParseFloor (FScanner &sc) FTextureID picnum; int terrain; + bool opt = sc.CheckString("optional"); sc.MustGetString (); + picnum = TexMan.CheckForTexture (sc.String, FTexture::TEX_Flat, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_TryAny); + if (!picnum.Exists()) { - Printf ("Unknown flat %s\n", sc.String); - sc.MustGetString (); + sc.MustGetString(); + if (!opt) + { + Printf("Unknown flat %s\n", sc.String); + } return; } sc.MustGetString ();