zdoom
/
gzdoom-gles
mirror of https://github.com/ZDoom/gzdoom-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- missed one texture name field in level_info_t.

This commit is contained in:
Christoph Oelckers 2014-05-13 15:32:54 +02:00
parent a22670626c
commit ebd6c18bef
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/g_level.cpp
View File

@ -656,7 +656,7 @@ void G_DoCompleted (void)
AM_Stop (); AM_Stop ();
wminfo.finished_ep = level.cluster - 1; 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; wminfo.current = level.mapname;
if (deathmatch && if (deathmatch &&
@ -677,7 +677,7 @@ void G_DoCompleted (void)
else else
{ {
wminfo.next = nextinfo->mapname; wminfo.next = nextinfo->mapname;
wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->pname, FTexture::TEX_MiscPatch)]; wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->PName, FTexture::TEX_MiscPatch)];
} }
} }

2
src/g_level.h
View File

@ -270,9 +270,9 @@ struct level_info_t
int levelnum; int levelnum;
char mapname[9]; char mapname[9];
char pname[9];
char nextmap[11]; char nextmap[11];
char secretmap[11]; char secretmap[11];
FString PName;
FString SkyPic1; FString SkyPic1;
FString SkyPic2; FString SkyPic2;
FString FadeTable; FString FadeTable;

4
src/g_mapinfo.cpp
View File

@ -227,7 +227,7 @@ void level_info_t::Reset()
mapname[0] = 0; mapname[0] = 0;
MapBackground = ""; MapBackground = "";
levelnum = 0; levelnum = 0;
pname[0] = 0; PName = "";
nextmap[0] = 0; nextmap[0] = 0;
secretmap[0] = 0; secretmap[0] = 0;
SkyPic1 = SkyPic2 = "-NOFLAT-"; SkyPic1 = SkyPic2 = "-NOFLAT-";
@ -898,7 +898,7 @@ DEFINE_MAP_OPTION(outsidefog, true)
DEFINE_MAP_OPTION(titlepatch, true) DEFINE_MAP_OPTION(titlepatch, true)
{ {
parse.ParseAssign(); parse.ParseAssign();
parse.ParseLumpOrTextureName(info->pname); parse.ParseLumpOrTextureName(info->PName);
} }
DEFINE_MAP_OPTION(partime, true) DEFINE_MAP_OPTION(partime, true)