diff --git a/src/g_statusbar/sbar.h b/src/g_statusbar/sbar.h index 3c911e693..1e8af1514 100644 --- a/src/g_statusbar/sbar.h +++ b/src/g_statusbar/sbar.h @@ -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; diff --git a/src/g_statusbar/strife_sbar.cpp b/src/g_statusbar/strife_sbar.cpp index 177117eb2..972657482 100644 --- a/src/g_statusbar/strife_sbar.cpp +++ b/src/g_statusbar/strife_sbar.cpp @@ -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;