From 125be6b54e07c91ee3fd2a1396c43b701b0fa336 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 7 Feb 2009 08:52:07 +0000 Subject: [PATCH] - Fixed: G_SerializeLevel must use the TEXMAN_ReturnFirst flag for getting the sky textures so that it still works when the first texture in a TEXTURE1 lump is used as sky. SVN r1412 (trunk) --- docs/rh-log.txt | 5 +++++ src/g_level.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/rh-log.txt b/docs/rh-log.txt index 088f207c7..12d9f1934 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,3 +1,8 @@ +February 7, 2009 (Changes by Graf Zahl) +- Fixed: G_SerializeLevel must use the TEXMAN_ReturnFirst flag for getting + the sky textures so that it still works when the first texture in a TEXTURE1 + lump is used as sky. + February 6, 2009 - Restored the old drawseg/sprite distance check from 2.0.63. The code that replaced it did the check at the center of the area intersected by the diff --git a/src/g_level.cpp b/src/g_level.cpp index 448d1658c..8c2e06886 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -1421,8 +1421,8 @@ void G_SerializeLevel (FArchive &arc, bool hubLoad) { strncpy (level.skypic1, arc.ReadName(), 8); strncpy (level.skypic2, arc.ReadName(), 8); - sky1texture = TexMan.GetTexture (level.skypic1, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable); - sky2texture = TexMan.GetTexture (level.skypic2, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable); + sky1texture = TexMan.GetTexture (level.skypic1, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst); + sky2texture = TexMan.GetTexture (level.skypic2, FTexture::TEX_Wall, FTextureManager::TEXMAN_Overridable|FTextureManager::TEXMAN_ReturnFirst); R_InitSkyMap (); }