Merge remote-tracking branch 'remotes/zdoom/master'

src/am_map.cpp

@@ -1144,7 +1144,7 @@ static void AM_ScrollParchment (double dmapx, double dmapy)
 	mapystart = mapystart - dmapy * scale_mtof;
 
 	mapxstart = clamp(mapxstart, -40000., 40000.);
-	mapystart = clamp(mapxstart, -40000., 40000.);
+	mapystart = clamp(mapystart, -40000., 40000.);
 
 	if (mapback.isValid())
 	{

src/p_acs.cpp

@@ -81,6 +81,7 @@
 #include "p_effect.h"
 #include "r_utility.h"
 #include "a_morph.h"
+#include "i_music.h"
 
 #include "g_shared/a_pickups.h"
 
@@ -4500,6 +4501,8 @@ enum EACSFunctions
 	ACSF_SetSectorDamage,
 	ACSF_SetSectorTerrain,
 	ACSF_SpawnParticle,
+	ACSF_SetMusicVolume,
+	// 2 more left...
 	
 	/* Zandronum's - these must be skipped when we reach 99!
 	-100:ResetMap(0),
@@ -6087,6 +6090,10 @@ doplaysound:			if (funcIndex == ACSF_PlayActorSound)
 								color, fullbright, startalpha/255., lifetime, size, fadestep/255.);
 		}
 		break;
+
+		case ACSF_SetMusicVolume:
+			I_SetMusicVolume(ACSToFloat(args[0]));
+			break;
 		
 		default:
 			break;

src/p_saveg.cpp

@@ -547,15 +547,7 @@ void P_SerializePolyobjs (FArchive &arc)
 		arc << seg << po_NumPolyobjs;
 		for(i = 0, po = polyobjs; i < po_NumPolyobjs; i++, po++)
 		{
-			arc << po->tag << po->Angle << po->StartSpot.pos << po->interpolation;
+			arc << po->tag << po->Angle << po->StartSpot.pos << po->interpolation << po->bBlocked;
-			if (SaveVersion >= 4537)
-			{
-				arc << po->bBlocked;
-			}
-			else
-			{
-				po->bBlocked = false;
-			}
   		}
 	}
 	else
@@ -581,6 +573,15 @@ void P_SerializePolyobjs (FArchive &arc)
 				I_Error ("UnarchivePolyobjs: Invalid polyobj tag");
 			}
 			arc << angle << delta << po->interpolation;
+			if (SaveVersion >= 4537)
+			{
+				arc << po->bBlocked;
+			}
+			else
+			{
+				po->bBlocked = false;
+			}
+
 			po->RotatePolyobj (angle, true);
 			delta -= po->StartSpot.pos;
 			po->MovePolyobj (delta, true);

src/p_trace.cpp

@@ -463,7 +463,6 @@ bool FTraceInfo::LineCheck(intercept_t *in, double dist, DVector3 hit)
 		hit.Z < bf || hit.Z > bc ||
 		in->d.line->flags & WallMask)
 	{
-normalline:
 		// hit the wall
 		Results->HitType = TRACE_HitWall;
 		Results->Tier =