Merge https://github.com/coelckers/gzdoom

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;

src/g_statusbar/sbarinfo.cpp

@@ -54,7 +54,6 @@
 #include "v_palette.h"
 #include "p_acs.h"
 #include "gstrings.h"
-#include "version.h"
 #include "cmdlib.h"
 #include "g_levellocals.h"
 

src/g_statusbar/strife_sbar.cpp

@@ -181,18 +181,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 ();
 	}
 
@@ -296,10 +284,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;
 
@@ -829,8 +818,8 @@ private:
 		imgMEDI,
 		imgARM1,
 		imgARM2,
-
+		imgNEGATIVE,
-		NUM_STRIFESB_IMAGES
+		imgINumbers = imgFONG0,
 	};
 
 	FImageCollection Images;

src/gl/compatibility/gl_20.cpp

@@ -34,7 +34,6 @@
 #include "doomtype.h"
 #include "m_argv.h"
 #include "zstring.h"
-#include "version.h"
 #include "i_system.h"
 #include "v_text.h"
 #include "r_utility.h"

src/menu/menu.h

@@ -9,7 +9,6 @@
 #include "r_data/r_translate.h"
 #include "c_cvars.h"
 #include "v_font.h"
-#include "version.h"
 #include "textures/textures.h"
 
 EXTERN_CVAR(Float, snd_menuvolume)

src/scripting/decorate/thingdef_parse.cpp

@@ -52,7 +52,6 @@
 #include "backend/codegen.h"
 #include "w_wad.h"
 #include "v_video.h"
-#include "version.h"
 #include "v_text.h"
 #include "m_argv.h"
 

src/scripting/decorate/thingdef_states.cpp

@@ -54,7 +54,6 @@
 #include "i_system.h"
 #include "colormatcher.h"
 #include "backend/codegen.h"
-#include "version.h"
 #include "templates.h"
 #include "backend/vmbuilder.h"
 

src/scripting/zscript/zcc_compile.cpp

@@ -49,7 +49,6 @@
 #include "i_system.h"
 #include "gdtoa.h"
 #include "backend/vmbuilder.h"
-#include "version.h"
 
 static int GetIntConst(FxExpression *ex, FCompileContext &ctx)
 {