zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-17 17:41:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The wbstartstruct that gets passed to the level summary screen needs to be static

Browse source 
This variable is needed long after the function which sets it up will be exited. So this either needs to be dynamically allocated or static, and in this case using a static variable is simpler.  However, unlike before, it is only being accessed in the one function that needs to initialize it and pass to the summary screen and nowhere else.
This commit is contained in:
Christoph Oelckers 2019-02-18 00:43:40 +01:00
parent aa550310f6
commit 5970040672
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/g_level.cpp
View file

@ -754,6 +754,7 @@ void FLevelLocals::SecretExitLevel (int position)
//
//
//==========================================================================
static wbstartstruct_t staticWmInfo;
void G_DoCompleted (void)
{
@ -780,9 +781,7 @@ void G_DoCompleted (void)
// Close the conversation menu if open.
P_FreeStrifeConversations ();
wbstartstruct_t wminfo; // parms for world map / intermission
if (primaryLevel->DoCompleted(nextlevel, wminfo))
if (primaryLevel->DoCompleted(nextlevel, staticWmInfo))
{
gamestate = GS_INTERMISSION;
viewactive = false;
@ -792,10 +791,16 @@ void G_DoCompleted (void)
// if (statcopy)
// memcpy (statcopy, &wminfo, sizeof(wminfo));
WI_Start (&wminfo);
WI_Start (&staticWmInfo);
}
}
//==========================================================================
//
// Prepare the level to be exited and
// set up the wminfo struct for the coming intermission screen
//
//==========================================================================
bool FLevelLocals::DoCompleted (FString nextlevel, wbstartstruct_t &wminfo)
{
@ -817,6 +822,7 @@ bool FLevelLocals::DoCompleted (FString nextlevel, wbstartstruct_t &wminfo)
{
wminfo.next = MapName;
wminfo.LName1 = wminfo.LName0;
wminfo.nextname = wminfo.thisname;
}
else
{
@ -831,7 +837,7 @@ bool FLevelLocals::DoCompleted (FString nextlevel, wbstartstruct_t &wminfo)
{
wminfo.next = nextinfo->MapName;
wminfo.LName1 = TexMan.CheckForTexture(nextinfo->PName, ETextureType::MiscPatch);
wminfo.nextname = info->LookupLevelName(&langtable[1]);
wminfo.nextname = nextinfo->LookupLevelName(&langtable[1]);
}
}

1
src/wi_stuff.h
View file

@ -76,6 +76,7 @@ struct wbstartstruct_t
int pnum;
wbplayerstruct_t plyr[MAXPLAYERS];
};
// Intermission stats.