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

- turned the texture pointers in wbstartstruct_t into scripting compatible texture IDs.

This commit is contained in:
Christoph Oelckers 2017-02-23 18:33:49 +01:00
parent 17f04c5043
commit 4bae6e81db
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/g_level.cpp
View File

@ -776,7 +776,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.CheckForTexture(level.info->PName, FTexture::TEX_MiscPatch);
wminfo.current = level.MapName; wminfo.current = level.MapName;
if (deathmatch && if (deathmatch &&
@ -792,12 +792,12 @@ void G_DoCompleted (void)
if (nextinfo == NULL || strncmp (nextlevel, "enDSeQ", 6) == 0) if (nextinfo == NULL || strncmp (nextlevel, "enDSeQ", 6) == 0)
{ {
wminfo.next = nextlevel; wminfo.next = nextlevel;
wminfo.LName1 = NULL; wminfo.LName1.SetInvalid();
} }
else else
{ {
wminfo.next = nextinfo->MapName; wminfo.next = nextinfo->MapName;
wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->PName, FTexture::TEX_MiscPatch)]; wminfo.LName1 = TexMan.CheckForTexture(nextinfo->PName, FTexture::TEX_MiscPatch);
} }
} }

4
src/wi_stuff.cpp
View File

@ -836,7 +836,7 @@ public:
{ {
int y = WI_TITLEY * CleanYfac; int y = WI_TITLEY * CleanYfac;
y = WI_DrawName(y, wbs->LName0, lnametexts[0]); y = WI_DrawName(y, TexMan(wbs->LName0), lnametexts[0]);
// Adjustment for different font sizes for map name and 'finished'. // Adjustment for different font sizes for map name and 'finished'.
y -= ((mapname.mFont->GetHeight() - finished.mFont->GetHeight()) * CleanYfac) / 4; y -= ((mapname.mFont->GetHeight() - finished.mFont->GetHeight()) * CleanYfac) / 4;
@ -866,7 +866,7 @@ public:
y = WI_DrawPatchText(y, &entering, "WI_ENTERING"); y = WI_DrawPatchText(y, &entering, "WI_ENTERING");
y += entering.mFont->GetHeight() * CleanYfac / 4; y += entering.mFont->GetHeight() * CleanYfac / 4;
WI_DrawName(y, wbs->LName1, lnametexts[1]); WI_DrawName(y, TexMan(wbs->LName1), lnametexts[1]);
} }

4
src/wi_stuff.h
View File

@ -51,8 +51,8 @@ struct wbstartstruct_t
FString current; // [RH] Name of map just finished FString current; // [RH] Name of map just finished
FString next; // next level, [RH] actual map name FString next; // next level, [RH] actual map name
FTexture *LName0; FTextureID LName0;
FTexture *LName1; FTextureID LName1;
int maxkills; int maxkills;
int maxitems; int maxitems;