zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed some mess in the graphics organization for the Strife status bar.

Browse source 
This alternatingly loaded two different patch sets but it was entirely unclear which was supposed to be loaded when so they now are merged into one. It should have been two different variables from the start.
This commit is contained in:
Christoph Oelckers 2017-02-20 00:22:36 +01:00
parent b134ea5b4f
commit 051a394f47
2 changed files with 5 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/g_statusbar/sbar.h
View file

@ -404,16 +404,6 @@ public:
double CrosshairSize;
double Displacement;
enum
{
imgLAME = 0,
imgNEGATIVE = 1,
imgINumbers = 2,
imgBNEGATIVE = 12,
imgBNumbers = 13,
imgSmNumbers = 23,
NUM_BASESB_IMAGES = 33
};
FImageCollection Images;
player_t *CPlayer;

21
src/g_statusbar/strife_sbar.cpp
View file

@ -186,18 +186,6 @@ class DStrifeStatusBar : public DBaseStatusBar
public:
DStrifeStatusBar () : DBaseStatusBar (32)
{
static const char *sharedLumpNames[] =
{
NULL, NULL, "INVFONY0", "INVFONY1", "INVFONY2",
"INVFONY3", "INVFONY4", "INVFONY5", "INVFONY6", "INVFONY7",
"INVFONY8", "INVFONY9", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, "INVFONG0", "INVFONG1",
"INVFONG2", "INVFONG3", "INVFONG4", "INVFONG5", "INVFONG6",
"INVFONG7", "INVFONG8", "INVFONG9"
};
DBaseStatusBar::Images.Init (sharedLumpNames, NUM_BASESB_IMAGES);
DoCommonInit ();
}
@ -301,10 +289,11 @@ private:
"INVFONY0", "INVFONY1", "INVFONY2", "INVFONY3", "INVFONY4",
"INVFONY5", "INVFONY6", "INVFONY7", "INVFONY8", "INVFONY9",
"INVFONY%",
"I_COMM", "I_MDKT", "I_ARM1", "I_ARM2"
"I_COMM", "I_MDKT", "I_ARM1", "I_ARM2", nullptr
};
Images.Init (strifeLumpNames, NUM_STRIFESB_IMAGES);
Images.Init (strifeLumpNames, countof(strifeLumpNames));
CursorImage = Images[imgINVCURS] != NULL ? imgINVCURS : imgCURSOR01;
@ -834,8 +823,8 @@ private:
imgMEDI,
imgARM1,
imgARM2,
NUM_STRIFESB_IMAGES
imgNEGATIVE,
imgINumbers = imgFONG0,
};
FImageCollection Images;