From 995d6f52e73135ad2be21899c1f9b69aac175eb8 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Tue, 5 Feb 2013 02:39:47 +0000 Subject: [PATCH] - Allow terrain definitions to work with overrides and non-flats. SVN r4064 (trunk) --- src/p_terrain.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/p_terrain.cpp b/src/p_terrain.cpp index c3df86b27..fdd98c96a 100644 --- a/src/p_terrain.cpp +++ b/src/p_terrain.cpp @@ -631,7 +631,8 @@ static void ParseFloor (FScanner &sc) int terrain; sc.MustGetString (); - picnum = TexMan.CheckForTexture (sc.String, FTexture::TEX_Flat); + picnum = TexMan.CheckForTexture (sc.String, FTexture::TEX_Flat, + FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_TryAny); if (!picnum.Exists()) { Printf ("Unknown flat %s\n", sc.String); @@ -650,7 +651,7 @@ static void ParseFloor (FScanner &sc) //========================================================================== // -// ParseFloor +// ParseDefault // //==========================================================================