zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-03-13 06:22:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add new SBARINFO top level "AppendStatusBar", allowing for extra SBARINFO code to be added to custom SBARINFO definitions.

Browse source
This commit is contained in:
BinarryCode 2024-10-03 09:18:19 -07:00 committed by Rachael Alexanderson
parent 941f9502e9
commit 27c6d34537
No known key found for this signature in database
GPG key ID: 26A8ACCE97115EE0
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/g_statusbar/sbarinfo.cpp
View file

@ -381,6 +381,7 @@ enum //Key words
SBARINFO_MUGSHOT, SBARINFO_MUGSHOT,
SBARINFO_CREATEPOPUP, SBARINFO_CREATEPOPUP,
SBARINFO_PROTRUSION, SBARINFO_PROTRUSION,
SBARINFO_APPENDSTATUSBAR,
}; };
enum //Bar types enum //Bar types
@ -410,6 +411,7 @@ static const char *SBarInfoTopLevel[] =
"mugshot", "mugshot",
"createpopup", "createpopup",
"protrusion", "protrusion",
"appendstatusbar",
NULL NULL
}; };
@ -629,6 +631,7 @@ void SBarInfo::ParseSBarInfo(int lump)
sc.MustGetToken(';'); sc.MustGetToken(';');
break; break;
case SBARINFO_STATUSBAR: case SBARINFO_STATUSBAR:
case SBARINFO_APPENDSTATUSBAR:
{ {
if(!baseSet) //If the user didn't explicitly define a base, do so now. if(!baseSet) //If the user didn't explicitly define a base, do so now.
gameType = GAME_Any; gameType = GAME_Any;
@ -638,11 +641,16 @@ void SBarInfo::ParseSBarInfo(int lump)
sc.MustGetToken(TK_Identifier); sc.MustGetToken(TK_Identifier);
barNum = sc.MustMatchString(StatusBars); barNum = sc.MustMatchString(StatusBars);
} }
if (this->huds[barNum] != NULL) // SBARINFO_APPENDSTATUSBAR shouldn't delete the old HUD if it exists.
const bool append = (sc.MustMatchString(SBarInfoTopLevel) == SBARINFO_APPENDSTATUSBAR);
if (!append)
{ {
delete this->huds[barNum]; if (this->huds[barNum] != NULL)
{
delete this->huds[barNum];
}
this->huds[barNum] = new SBarInfoMainBlock(this);
} }
this->huds[barNum] = new SBarInfoMainBlock(this);
if(barNum == STBAR_AUTOMAP) if(barNum == STBAR_AUTOMAP)
{ {
automapbar = true; automapbar = true;