From ebd6c18bef6ed7e2508d8ee14cb3b65d1fe587fb Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 13 May 2014 15:32:54 +0200 Subject: [PATCH] - missed one texture name field in level_info_t. --- src/g_level.cpp | 4 ++-- src/g_level.h | 2 +- src/g_mapinfo.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/g_level.cpp b/src/g_level.cpp index 47ad66998..c3e78d223 100644 --- a/src/g_level.cpp +++ b/src/g_level.cpp @@ -656,7 +656,7 @@ void G_DoCompleted (void) AM_Stop (); wminfo.finished_ep = level.cluster - 1; - wminfo.LName0 = TexMan[TexMan.CheckForTexture(level.info->pname, FTexture::TEX_MiscPatch)]; + wminfo.LName0 = TexMan[TexMan.CheckForTexture(level.info->PName, FTexture::TEX_MiscPatch)]; wminfo.current = level.mapname; if (deathmatch && @@ -677,7 +677,7 @@ void G_DoCompleted (void) else { wminfo.next = nextinfo->mapname; - wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->pname, FTexture::TEX_MiscPatch)]; + wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->PName, FTexture::TEX_MiscPatch)]; } } diff --git a/src/g_level.h b/src/g_level.h index 43644a279..85a2ff0e4 100644 --- a/src/g_level.h +++ b/src/g_level.h @@ -270,9 +270,9 @@ struct level_info_t int levelnum; char mapname[9]; - char pname[9]; char nextmap[11]; char secretmap[11]; + FString PName; FString SkyPic1; FString SkyPic2; FString FadeTable; diff --git a/src/g_mapinfo.cpp b/src/g_mapinfo.cpp index d8e12e9e4..c261e2f33 100644 --- a/src/g_mapinfo.cpp +++ b/src/g_mapinfo.cpp @@ -227,7 +227,7 @@ void level_info_t::Reset() mapname[0] = 0; MapBackground = ""; levelnum = 0; - pname[0] = 0; + PName = ""; nextmap[0] = 0; secretmap[0] = 0; SkyPic1 = SkyPic2 = "-NOFLAT-"; @@ -898,7 +898,7 @@ DEFINE_MAP_OPTION(outsidefog, true) DEFINE_MAP_OPTION(titlepatch, true) { parse.ParseAssign(); - parse.ParseLumpOrTextureName(info->pname); + parse.ParseLumpOrTextureName(info->PName); } DEFINE_MAP_OPTION(partime, true)