Merge branch 'master' into zscript

src/am_map.cpp

@@ -473,6 +473,11 @@ static AMColorset AMMod;
 static AMColorset AMModOverlay;
 
 
+void AM_ClearColorsets()
+{
+	AMModOverlay.defined = false;
+	AMMod.defined = false;
+}
 //=============================================================================
 //
 //

src/am_map.h

@@ -27,6 +27,7 @@ class FSerializer;
 
 
 void AM_StaticInit();
+void AM_ClearColorsets();	// reset data for a restart.
 
 // Called by main loop.
 bool AM_Responder (event_t* ev, bool last);

src/d_main.cpp

@@ -2598,14 +2598,16 @@ void D_DoomMain (void)
 				G_DeferedPlayDemo (v);
 				D_DoomLoop ();	// never returns
 			}
-
+			else
-			v = Args->CheckValue ("-timedemo");
+			{
+				v = Args->CheckValue("-timedemo");
 				if (v)
 				{
-				G_TimeDemo (v);
+					G_TimeDemo(v);
-				D_DoomLoop ();	// never returns
+					D_DoomLoop();	// never returns
 				}
-
+				else
+				{
 					if (gameaction != ga_loadgame && gameaction != ga_loadgamehidecon)
 					{
 						if (autostart || netgame)
@@ -2615,10 +2617,10 @@ void D_DoomMain (void)
 							{
 								NoWipe = TICRATE;
 							}
-					CheckWarpTransMap (startmap, true);
+							CheckWarpTransMap(startmap, true);
 							if (demorecording)
-						G_BeginRecording (startmap);
+								G_BeginRecording(startmap);
-					G_InitNew (startmap, false);
+							G_InitNew(startmap, false);
 							if (StoredWarp.IsNotEmpty())
 							{
 								AddCommandString(StoredWarp.LockBuffer());
@@ -2627,15 +2629,17 @@ void D_DoomMain (void)
 						}
 						else
 						{
-					D_StartTitle ();				// start up intro loop
+							D_StartTitle();				// start up intro loop
 						}
 					}
 					else if (demorecording)
 					{
-				G_BeginRecording (NULL);
+						G_BeginRecording(NULL);
 					}
 
-			atterm (D_QuitNetGame);		// killough
+					atterm(D_QuitNetGame);		// killough
+				}
+			}
 		}
 		else
 		{
@@ -2649,7 +2653,7 @@ void D_DoomMain (void)
 		}
 
 		D_DoomLoop ();		// this only returns if a 'restart' CCMD is given.
-
+maxberestart:
 		// 
 		// Clean up after a restart
 		//
@@ -2660,6 +2664,7 @@ void D_DoomMain (void)
 
 		M_ClearMenus();					// close menu if open
 		F_EndFinale();					// If an intermission is active, end it now
+		AM_ClearColorsets();
 
 		// clean up game state
 		ST_Clear();

src/p_slopes.cpp

@@ -178,8 +178,8 @@ void P_SetSlope (secplane_t *plane, bool setCeil, int xyangi, int zangi, const D
 	if (ib_compatflags & BCOMPATF_SETSLOPEOVERFLOW)
 	{
 		// We have to consider an integer multiplication overflow here.
-		norm[0] = FixedToFloat(FloatToFixed(zang.Cos()) * FloatToFixed(xyang.Cos()));
+		norm[0] = FixedToFloat(FloatToFixed(zang.Cos()) * FloatToFixed(xyang.Cos())) / 65536.;
-		norm[1] = FixedToFloat(FloatToFixed(zang.Cos()) * FloatToFixed(xyang.Sin()));
+		norm[1] = FixedToFloat(FloatToFixed(zang.Cos()) * FloatToFixed(xyang.Sin())) / 65536.;
 	}
 	else
 	{

src/po_man.cpp

@@ -1775,7 +1775,14 @@ void PO_Init (void)
 			}
 		}
 	}
-
+	// clear all polyobj specials so that they do not obstruct using other lines.
+	for (int i = 0; i < numlines; i++)
+	{
+		if (lines[i].special == Polyobj_ExplicitLine || lines[i].special == Polyobj_StartLine)
+		{
+			lines[i].special = 0;
+		}
+	}
 }
 
 //==========================================================================

wadsrc/static/compatibility.txt

@@ -27,6 +27,7 @@
 	setwallyscale 717 front bot 1.090909
 
 	setslopeoverflow
+	polyobj
 }
 
 B2D8DA03489D1C67F60DC87FBC4EA338 // map01 - Massmouth 2