Merge remote-tracking branch 'origin/master' into post-4.13

# Conflicts:
#	src/playsim/p_3dfloors.cpp
#	src/playsim/p_mobj.cpp
#	src/playsim/p_spec.cpp
#	src/playsim/p_spec.h
#	src/version.h

specs/udmf_zdoom.txt

@@ -203,21 +203,21 @@ Note: All <bool> fields default to false unless mentioned otherwise.
 	  nogradient_top = <bool>;	    // disables color gradient on upper tier. (Hardware rendering only.)
 	  flipgradient_top = <bool>;    // flips gradient colors on upper tier. (Hardware rendering only.)
 	  clampgradient_top = <bool>;   // clamps gradient on upper tier to actual bounds (default is the entire front sector height, hardware rendering only.)
-	  useowncolors_top = <bool>;    // Set to 1 to use the colors set in the sidedef. Default is using the colors from the owning sector.
+	  useowncolors_top = <bool>;    // Set to 1 to use the colors set in the sidedef. Default is true if uppercolor or lowercolor are set, otherwise it's false
 	  uppercolor_top = <int>;       // Material color of the top of the upper tier.
 	  lowercolor_top = <int>;       // Material color of the bottom of the upper tier. (Hardware rendering only.)
 
 	  nogradient_mid = <bool>;	    // disables color gradient on middle tier. (Hardware rendering only.)
 	  flipgradient_mid = <bool>;    // flips gradient colors on middle tier. (Hardware rendering only.)
 	  clampgradient_mid = <bool>;   // clamps gradient on middle tier to actual bounds (default is the entire front sector height, hardware rendering only.)
-	  useowncolors_mid = <bool>;    // Set to 1 to use the colors set in the sidedef. Default is using the colors from the owning sector.
+	  useowncolors_mid = <bool>;    // Set to 1 to use the colors set in the sidedef. Default is true if uppercolor or lowercolor are set, otherwise it's false
 	  uppercolor_mid = <int>;       // Material color of the top of the middle tier.
 	  lowercolor_mid = <int>;       // Material color of the bottom of the middle tier. (Hardware rendering only.)
 
 	  nogradient_bottom = <bool>;   // disables color gradient on lower tier. (Hardware rendering only.)
 	  flipgradient_bottom = <bool>; // flips gradient colors on lower tier. (Hardware rendering only.)
 	  clampgradient_bottom = <bool>;// clamps gradient on lower tier to actual bounds (default is the entire front sector height, hardware rendering only.)
-	  useowncolors_bottom = <bool>; // Set to 1 to use the colors set in the sidedef. Default is using the colors from the owning sector.
+	  useowncolors_bottom = <bool>; // Set to 1 to use the colors set in the sidedef. Default is true if uppercolor or lowercolor are set, otherwise it's false
 	  uppercolor_bottom = <int>;    // Material color of the top of the lower tier.
 	  lowercolor_bottom = <int>;    // Material color of the bottom of the lower tier. (Hardware rendering only.)
 
@@ -307,6 +307,8 @@ Note: All <bool> fields default to false unless mentioned otherwise.
       leakiness = <int>;              // Probability of leaking through radiation suit (0 = never, 256 = always), default = 0.
       damageterraineffect = <bool>;   // Will spawn a terrain splash when damage is inflicted. Default = false.
       damagehazard = <bool>;          // Changes damage model to Strife's delayed damage for the given sector. Default = false.
+      hurtmonsters = <bool>;          // Non-players like monsters and decorations are hurt by this sector in the same manner as player. Doesn't work with damagehazard.
+      harminair = <bool>;             // Actors in this sector are harmed by the damage effects of the floor even if they aren't touching it.
       floorterrain = <string>;        // Sets the terrain for the sector's floor. Default = 'use the flat texture's terrain definition.'
       ceilingterrain = <string>;      // Sets the terrain for the sector's ceiling. Default = 'use the flat texture's terrain definition.'
       floor_reflect = <float>;        // reflectiveness of floor (OpenGL only, not functional on sloped sectors)

src/common/2d/v_2ddrawer.h

@@ -8,6 +8,7 @@
 #include "renderstyle.h"
 #include "dobject.h"
 #include "refcounted.h"
+#include "printf.h"
 
 struct DrawParms;
 struct FColormap;
@@ -279,6 +280,7 @@ class F2DDrawer
 class FCanvas : public DObject
 {
 	DECLARE_CLASS(FCanvas, DObject)
+	void OnDestroy() override { I_Error("Calling Destroy on a canvas object is not allowed."); }
 public:
 	F2DDrawer Drawer;
 	FCanvasTexture* Tex = nullptr;

src/common/2d/wipe.cpp

@@ -43,6 +43,8 @@
 #include "s_soundinternal.h"
 #include "i_time.h"
 
+EXTERN_CVAR(Bool, cl_capfps)
+
 class FBurnTexture : public FTexture
 {
 	TArray<uint32_t> WorkBuffer;
@@ -163,6 +165,8 @@ class Wiper
 public:
 	virtual ~Wiper();
 	virtual bool Run(int ticks) = 0;
+	virtual bool RunInterpolated(double ticks) { return true; };
+	virtual bool Interpolatable() { return false; }
 	virtual void SetTextures(FGameTexture* startscreen, FGameTexture* endscreen)
 	{
 		startScreen = startscreen;
@@ -177,20 +181,24 @@ class Wiper_Crossfade : public Wiper
 {
 public:
 	bool Run(int ticks) override;
+	bool RunInterpolated(double ticks) override;
+	bool Interpolatable() override { return true; }
 
 private:
-	int Clock = 0;
+	float Clock = 0;
 };
 
 class Wiper_Melt : public Wiper
 {
 public:
 	Wiper_Melt();
 	bool Run(int ticks) override;
+	bool RunInterpolated(double ticks) override;
+	bool Interpolatable() override { return true; }
 
 private:
 	enum { WIDTH = 320, HEIGHT = 200 };
-	int y[WIDTH];
+	double y[WIDTH];
 };
 
 class Wiper_Burn : public Wiper
@@ -268,7 +276,23 @@ bool Wiper_Crossfade::Run(int ticks)
 	Clock += ticks;
 	DrawTexture(twod, startScreen, 0, 0, DTA_FlipY, screen->RenderTextureIsFlipped(), DTA_Masked, false, TAG_DONE);
 	DrawTexture(twod, endScreen, 0, 0, DTA_FlipY, screen->RenderTextureIsFlipped(), DTA_Masked, false, DTA_Alpha, clamp(Clock / 32.f, 0.f, 1.f), TAG_DONE);
-	return Clock >= 32;
+	return Clock >= 32.;
+}
+
+//==========================================================================
+//
+// OpenGLFrameBuffer :: Wiper_Crossfade :: Run
+//
+// Fades the old screen into the new one over 32 ticks.
+//
+//==========================================================================
+
+bool Wiper_Crossfade::RunInterpolated(double ticks)
+{
+	Clock += ticks;
+	DrawTexture(twod, startScreen, 0, 0, DTA_FlipY, screen->RenderTextureIsFlipped(), DTA_Masked, false, TAG_DONE);
+	DrawTexture(twod, endScreen, 0, 0, DTA_FlipY, screen->RenderTextureIsFlipped(), DTA_Masked, false, DTA_Alpha, clamp(Clock / 32.f, 0.f, 1.f), TAG_DONE);
+	return Clock >= 32.;
 }
 
 //==========================================================================
@@ -282,7 +306,7 @@ Wiper_Melt::Wiper_Melt()
 	y[0] = -(M_Random() & 15);
 	for (int i = 1; i < WIDTH; ++i)
 	{
-		y[i] = clamp(y[i-1] + (M_Random() % 3) - 1, -15, 0);
+		y[i] = clamp(y[i-1] + (double)(M_Random() % 3) - 1., -15., 0.);
 	}
 }
 
@@ -307,33 +331,33 @@ bool Wiper_Melt::Run(int ticks)
 		{
 			if (y[i] < HEIGHT)
 			{
-				if (y[i] < 0)
-					y[i]++;
-				else if (y[i] < 16)
-					y[i] += y[i] + 1;
+				if (y[i] < 0.)
+					y[i] = y[i] + 1.;
+				else if (y[i] < 16.)
+					y[i] += y[i] + 1.;
 				else
-					y[i] = min<int>(y[i] + 8, HEIGHT);
+					y[i] = min<double>(y[i] + 8., HEIGHT);
 				done = false;
 			}
 			if (ticks == 0)
 			{
 				struct {
 					int32_t x;
-					int32_t y;
+					double y;
 				} dpt;
 				struct {
 					int32_t left;
-					int32_t top;
+					double top;
 					int32_t right;
-					int32_t bottom;
+					double bottom;
 				} rect;
 
 				// Only draw for the final tick.
 
 				int w = startScreen->GetTexelWidth();
 				int h = startScreen->GetTexelHeight();
 				dpt.x = i * w / WIDTH;
-				dpt.y = max(0, y[i] * h / HEIGHT);
+				dpt.y = max(0., y[i] * (double)h / (double)HEIGHT);
 				rect.left = dpt.x;
 				rect.top = 0;
 				rect.right = (i + 1) * w / WIDTH;
@@ -348,6 +372,77 @@ bool Wiper_Melt::Run(int ticks)
 	return done;
 }
 
+//==========================================================================
+//
+// Wiper_Melt :: RunInterpolated
+//
+// Melts the old screen into the new one over 32 ticks (interpolated).
+//
+//==========================================================================
+
+bool Wiper_Melt::RunInterpolated(double ticks)
+{
+	bool done = false;
+	DrawTexture(twod, endScreen, 0, 0, DTA_FlipY, screen->RenderTextureIsFlipped(), DTA_Masked, false, TAG_DONE);
+
+	// Copy the old screen in vertical strips on top of the new one.
+	while (ticks > 0.)
+	{
+		done = true;
+		for (int i = 0; i < WIDTH; i++)
+		{
+			if (y[i] < (double)HEIGHT)
+			{
+				if (ticks > 0. && ticks < 1.)
+				{
+					if (y[i] < 0)
+						y[i] += ticks;
+					else if (y[i] < 16)
+						y[i] += (y[i] + 1) * ticks;
+					else
+						y[i] = min<double>(y[i] + (8 * ticks), (double)HEIGHT);
+				}
+				else if (y[i] < 0.)
+					y[i] = y[i] + 1.;
+				else if (y[i] < 16.)
+					y[i] += y[i] + 1.;
+				else
+					y[i] = min<double>(y[i] + 8., HEIGHT);
+				done = false;
+			}
+		}
+		ticks -= 1.;
+	}
+	for (int i = 0; i < WIDTH; i++)
+	{
+		struct {
+			int32_t x;
+			double y;
+		} dpt;
+		struct {
+			int32_t left;
+			double top;
+			int32_t right;
+			double bottom;
+		} rect;
+
+		// Only draw for the final tick.
+		int w = startScreen->GetTexelWidth();
+		double h = startScreen->GetTexelHeight();
+		dpt.x = i * w / WIDTH;
+		dpt.y = max(0., y[i] * (double)h / (double)HEIGHT);
+		rect.left = dpt.x;
+		rect.top = 0;
+		rect.right = (i + 1) * w / WIDTH;
+		rect.bottom = h - dpt.y;
+		if (rect.bottom > rect.top)
+		{
+			DrawTexture(twod, startScreen, 0, dpt.y, DTA_FlipY, screen->RenderTextureIsFlipped(), DTA_ClipLeft, rect.left, DTA_ClipRight, rect.right, DTA_Masked, false, TAG_DONE);
+		}
+	}
+	return done;
+}
+
 //==========================================================================
 //
 // OpenGLFrameBuffer :: Wiper_Burn Constructor
@@ -423,6 +518,7 @@ void PerformWipe(FTexture* startimg, FTexture* endimg, int wipe_type, bool stops
 {
 	// wipe update
 	uint64_t wipestart, nowtime, diff;
+	double diff_frac;
 	bool done;
 
 	GSnd->SetSfxPaused(true, 1);
@@ -438,20 +534,34 @@ void PerformWipe(FTexture* startimg, FTexture* endimg, int wipe_type, bool stops
 
 	do
 	{
-		do
+		if (wiper->Interpolatable() && !cl_capfps)
 		{
-			I_WaitVBL(2);
 			nowtime = I_msTime();
-			diff = (nowtime - wipestart) * 40 / 1000;	// Using 35 here feels too slow.
-		} while (diff < 1);
-		wipestart = nowtime;
-		twod->Begin(screen->GetWidth(), screen->GetHeight());
-		done = wiper->Run(1);
-		if (overlaydrawer) overlaydrawer();
-		twod->End();
-		screen->Update();
-		twod->OnFrameDone();
-
+			diff_frac = (nowtime - wipestart) * 40. / 1000.;	// Using 35 here feels too slow.
+			wipestart = nowtime;
+			twod->Begin(screen->GetWidth(), screen->GetHeight());
+			done = wiper->RunInterpolated(diff_frac);
+			if (overlaydrawer) overlaydrawer();
+			twod->End();
+			screen->Update();
+			twod->OnFrameDone();
+		}
+		else
+		{
+			do
+			{
+				I_WaitVBL(2);
+				nowtime = I_msTime();
+				diff = (nowtime - wipestart) * 40 / 1000;	// Using 35 here feels too slow.
+			} while (diff < 1);
+			wipestart = nowtime;
+			twod->Begin(screen->GetWidth(), screen->GetHeight());
+			done = wiper->Run(1);
+			if (overlaydrawer) overlaydrawer();
+			twod->End();
+			screen->Update();
+			twod->OnFrameDone();
+		}
 	} while (!done);
 	delete wiper;
 	I_FreezeTime(false);

src/common/audio/sound/i_sound.cpp

@@ -62,6 +62,9 @@ CUSTOM_CVAR(Int, snd_samplerate, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Int, snd_buffersize, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 CVAR(Int, snd_hrtf, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
+CVAR(Float, snd_footstepvolume, 1.f, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
+
+
 #if !defined(NO_OPENAL)	
 #define DEF_BACKEND "openal"
 #else

src/common/platform/posix/i_system.h

@@ -54,17 +54,6 @@ bool I_WriteIniFailed (const char* filename);
 class FGameTexture;
 bool I_SetCursor(FGameTexture *);
 
-static inline char *strlwr(char *str)
-{
-	char *ptr = str;
-	while(*ptr)
-	{
-		*ptr = tolower(*ptr);
-		++ptr;
-	}
-	return str;
-}
-
 inline int I_GetNumaNodeCount() { return 1; }
 inline int I_GetNumaNodeThreadCount(int numaNode) { return std::max<int>(std::thread::hardware_concurrency(), 1); }
 inline void I_SetThreadNumaNode(std::thread &thread, int numaNode) { }

src/common/scripting/backend/vmbuilder.cpp

@@ -879,10 +879,18 @@ void FFunctionBuildList::Build()
 		{
 			if (!item.Code->CheckReturn())
 			{
-				auto newcmpd = new FxCompoundStatement(item.Code->ScriptPosition);
-				newcmpd->Add(item.Code);
-				newcmpd->Add(new FxReturnStatement(nullptr, item.Code->ScriptPosition));
-				item.Code = newcmpd->Resolve(ctx);
+				if (ctx.ReturnProto == nullptr || !ctx.ReturnProto->ReturnTypes.Size())
+				{
+					auto newcmpd = new FxCompoundStatement(item.Code->ScriptPosition);
+					newcmpd->Add(item.Code);
+					newcmpd->Add(new FxReturnStatement(nullptr, item.Code->ScriptPosition));
+					item.Code = newcmpd->Resolve(ctx);
+				}
+				else
+				{
+					item.Code->ScriptPosition.Message(MSG_ERROR, "Missing return statement in %s", item.PrintableName.GetChars());
+					continue;
+				}
 			}
 
 			item.Proto = ctx.ReturnProto;

src/common/scripting/interface/vmnatives.cpp

@@ -41,6 +41,7 @@
 #include "c_cvars.h"
 #include "c_bind.h"
 #include "c_dispatch.h"
+#include "m_misc.h"
 
 #include "menu.h"
 #include "vm.h"
@@ -1032,6 +1033,17 @@ DEFINE_ACTION_FUNCTION(_CVar, FindCVar)
 	ACTION_RETURN_POINTER(FindCVar(name.GetChars(), nullptr));
 }
 
+static int SaveConfig()
+{
+	return M_SaveDefaults(nullptr);
+}
+
+DEFINE_ACTION_FUNCTION_NATIVE(_CVar, SaveConfig, SaveConfig)
+{
+	PARAM_PROLOGUE;
+	ACTION_RETURN_INT(M_SaveDefaults(nullptr));
+}
+
 //=============================================================================
 //
 //