Merge remote-tracking branch 'origin/master' into asmjit

src/doomerrors.h

@@ -38,6 +38,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <exception>
+#include <stdexcept>
 
 #define MAX_ERRORTEXT	1024
 
@@ -70,7 +71,7 @@ public:
 		else
 			return NULL;
 	}
-	char const *what() const override
+	char const *what() const noexcept override
 	{
 		return m_Message;
 	}
@@ -80,10 +81,10 @@ protected:
 	char m_Message[MAX_ERRORTEXT];
 };
 
-class CNoRunExit : public std::exception
+class CNoRunExit : public std::runtime_error
 {
 public:
-	CNoRunExit() : std::exception("NoRunExit")
+	CNoRunExit() : std::runtime_error("NoRunExit")
 	{
 	}
 };

src/gi.cpp

@@ -61,7 +61,7 @@ DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, statusscreen_single)
 DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, statusscreen_coop)
 DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, statusscreen_dm)
 DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, mSliderColor)
-
+DEFINE_FIELD_X(GameInfoStruct, gameinfo_t, defaultbloodcolor)
 
 const char *GameNames[17] =
 {

src/hwrenderer/models/hw_models.cpp

@@ -147,7 +147,7 @@ FModelVertexBuffer::FModelVertexBuffer(bool needindex, bool singleframe)
 		{ 1, VATTR_VERTEX2, VFmt_Float3, (int)myoffsetof(FModelVertex, x) },
 		{ 1, VATTR_NORMAL2, VFmt_Packed_A2R10G10B10, (int)myoffsetof(FModelVertex, packedNormal) }
 	};
-	mVertexBuffer->SetFormat(2, 4, sizeof(FModelVertex), format);
+	mVertexBuffer->SetFormat(2, 5, sizeof(FModelVertex), format);
 }
 
 //===========================================================================

src/posix/sdl/i_main.cpp

@@ -265,11 +265,11 @@ int main (int argc, char **argv)
 			fprintf (stderr, "%s\n", error.what ());
 
 #ifdef __APPLE__
-		Mac_I_FatalError(error.GetMessage());
+		Mac_I_FatalError(error.what());
 #endif // __APPLE__
 
 #ifdef __linux__
-		Linux_I_FatalError(error.GetMessage());
+		Linux_I_FatalError(error.what());
 #endif // __linux__
 
 		exit (-1);

wadsrc/static/zscript/base.txt

@@ -366,6 +366,7 @@ struct GameInfoStruct native
 	native double gibfactor;
 	native bool intermissioncounter;
 	native Name mSliderColor;
+	native Color defaultbloodcolor;
 }
 
 class Object native