Merge branch 'master' of https://github.com/coelckers/gzdoom

.gitignore

@@ -54,3 +54,4 @@
 .vs
 /src/gl/unused
 /mapfiles_release/*.map
+.DS_Store

src/gameconfigfile.cpp

@@ -149,6 +149,7 @@ FGameConfigFile::FGameConfigFile ()
 		SetValueForKey ("Path", "$PROGDIR", true);
 #else
 		SetValueForKey ("Path", "$HOME/" GAME_DIR, true);
+		SetValueForKey ("Path", SHARE_DIR, true);
 		SetValueForKey ("Path", "/usr/local/share/doom", true);
 		SetValueForKey ("Path", "/usr/local/share/games/doom", true);
 		SetValueForKey ("Path", "/usr/share/doom", true);

src/gl/scene/gl_sprite.cpp

@@ -1211,7 +1211,7 @@ void GLSprite::ProcessParticle (particle_t *particle, sector_t *sector)//, int s
 	}
 
 	double timefrac = r_viewpoint.TicFrac;
-	if (paused || bglobal.freeze)
+	if (paused || bglobal.freeze || (level.flags2 & LEVEL2_FROZEN))
 		timefrac = 0.;
 	float xvf = (particle->Vel.X) * timefrac;
 	float yvf = (particle->Vel.Y) * timefrac;

src/p_setup.cpp

@@ -4138,15 +4138,18 @@ void P_SetupLevel (const char *lumpname, int position)
 
 	// [SP] move unfriendly players around
 	// horribly hacky - yes, this needs rewritten.
-	for (i = 0; i < MAXPLAYERS; ++i)
+	if (level.deathmatchstarts.Size () > 0)
 	{
-		if (playeringame[i] && players[i].mo != NULL)
+		for (i = 0; i < MAXPLAYERS; ++i)
 		{
-			if (!(players[i].mo->flags & MF_FRIENDLY))
+			if (playeringame[i] && players[i].mo != NULL)
 			{
-				AActor * oldSpawn = players[i].mo;
-				G_DeathMatchSpawnPlayer (i);
-				oldSpawn->Destroy();
+				if (!(players[i].mo->flags & MF_FRIENDLY))
+				{
+					AActor * oldSpawn = players[i].mo;
+					G_DeathMatchSpawnPlayer (i);
+					oldSpawn->Destroy();
+				}
 			}
 		}
 	}

src/polyrenderer/scene/poly_particle.cpp

@@ -35,7 +35,7 @@ EXTERN_CVAR(Int, gl_particles_style)
 void RenderPolyParticle::Render(PolyRenderThread *thread, const TriMatrix &worldToClip, const PolyClipPlane &clipPlane, particle_t *particle, subsector_t *sub, uint32_t stencilValue)
 {
 	double timefrac = r_viewpoint.TicFrac;
-	if (paused || bglobal.freeze)
+	if (paused || bglobal.freeze || (level.flags2 & LEVEL2_FROZEN))
 		timefrac = 0.;
 	DVector3 pos = particle->Pos + (particle->Vel * timefrac);
 	double psize = particle->size / 8.0;

src/s_environment.cpp

@@ -677,7 +677,7 @@ void S_UnloadReverbDef ()
 	Environments = &Off;
 }
 
-CUSTOM_CVAR(Bool, eaxedit_test, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL)
+CUSTOM_CVAR(Bool, eaxedit_test, false, CVAR_NOINITCALL)
 {
 	if (self)
 	{

src/scripting/zscript/zcc_parser.cpp

@@ -267,6 +267,7 @@ static void ParseSingleFile(FScanner *pSC, const char *filename, int lump, void
 
 	while (sc.GetToken())
 	{
+		value.Largest = 0;
 		value.SourceLoc = sc.GetMessageLine();
 		switch (sc.TokenType)
 		{

src/scripting/zscript/zcc_parser.h

@@ -7,11 +7,31 @@
 
 struct ZCCToken
 {
+	template <typename... Ts>
+	struct TLargest;
+
+	template <typename T>
+	struct TLargest<T>
+	{
+		using Type = T;
+	};
+
+	template <typename T, typename U, typename... Ts>
+	struct TLargest<T, U, Ts...>
+	{
+		using Type = typename TLargest<
+			typename std::conditional<
+				(sizeof(T) > sizeof(U)), T, U
+			>::type, Ts...
+		>::Type;
+	};
+
 	union
 	{
 		int Int;
 		double Float;
 		FString *String;
+		TLargest<decltype(Int), decltype(Float), decltype(String)>::Type Largest;
 	};
 	int SourceLoc;
 

src/sound/mididevices/music_timiditypp_mididevice.cpp

@@ -692,6 +692,10 @@ bool TimidityPPMIDIDevice::FillStream(SoundStream *stream, void *buff, int len,
 			}
 			break;
 		}
+		else if (r == 0 && errno != 0)
+		{
+			break;
+		}
 		got += r;
 	} while(got < len);
 	if(got < len)

src/swrenderer/things/r_particle.cpp

@@ -79,7 +79,7 @@ namespace swrenderer
 		sector_t*			heightsec = NULL;
 
 		double timefrac = r_viewpoint.TicFrac;
-		if (paused || bglobal.freeze)
+		if (paused || bglobal.freeze || (level.flags2 & LEVEL2_FROZEN))
 			timefrac = 0.;
 
 		double ippx = particle->Pos.X + particle->Vel.X * timefrac;

wadsrc/static/zscript/actor.txt

@@ -1186,6 +1186,10 @@ class Actor : Thinker native
 	{
 		return ACS_ExecuteAlways(-int(script), mapnum, arg1, arg2, arg3);
 	}
+	int ACS_ScriptCall(name script, int arg1=0, int arg2=0, int arg3=0, int arg4=0)
+	{
+		return ACS_ExecuteWithResult(-int(script), arg1, arg2, arg3, arg4);
+	}
 	
 	States(Actor, Overlay, Weapon, Item)
 	{

wadsrc/static/zscript/hexen/korax.txt

@@ -244,6 +244,11 @@ class Korax : Actor
 
 	void A_KoraxMissile()
 	{
+		if (!target)
+		{
+			return;
+		}
+
 		static const class<Actor> choices[] =
 		{
 			"WraithFX1", "Demon1FX1", "Demon2FX1", "FireDemonMissile", "CentaurFX", "SerpentFX"
@@ -282,6 +287,11 @@ class Korax : Actor
 
 	void KoraxFire (Class<Actor> type, int arm)
 	{
+		if (!target)
+		{
+			return;
+		}
+
 		static const int extension[] =
 		{
 			KORAX_ARM_EXTENSION_SHORT,