- fixing botched past merges, this should fix compile errors

src/d_main.cpp

@@ -790,7 +790,7 @@ void D_Display ()
 		screen->DrawBlend(viewsec);
 		if (automapactive)
 		{
-			primaryLevel->automap->Drawer ((hud_althud && viewheight == SCREENHEIGHT) ? viewheight : StatusBar->GetTopOfStatusbar());
+			primaryLevel->automap->Drawer (hud_althud? viewheight : StatusBar->GetTopOfStatusbar());
 		}
 		
 		// for timing the statusbar code.

src/gamedata/d_dehacked.cpp

@@ -2120,12 +2120,15 @@ static int PatchCodePtrs (int dummy)
 					symname.Format("A_%s", Line2);
 
 				// Let's consider as aliases some redundant MBF pointer
+				bool ismbfcp = false;
 				for (unsigned int i = 0; i < MBFCodePointers.Size(); i++)
 				{
 					if (!symname.CompareNoCase(MBFCodePointers[i].alias))
 					{
 						symname = MBFCodePointers[i].name;
 						DPrintf(DMSG_SPAMMY, "%s --> %s\n", MBFCodePointers[i].alias, MBFCodePointers[i].name.GetChars());
+						ismbfcp = true;
+						break;
 					}
 				}
 
@@ -2136,7 +2139,7 @@ static int PatchCodePtrs (int dummy)
 				{
 					Printf(TEXTCOLOR_RED "Frame %d: Unknown code pointer '%s'\n", frame, Line2);
 				}
-				else
+				else if (!ismbfcp)	// MBF special code pointers will produce errors here because they will receive some args and won't match the conditions here.
 				{
 					TArray<uint32_t> &args = sym->Variants[0].ArgFlags;
 					unsigned numargs = sym->GetImplicitArgs();

src/p_map.cpp

@@ -4147,6 +4147,7 @@ struct aim_t
 						thingtoppitch = -VecToAngle(exitdist, th->Top() - shootz);
 						if (thingtoppitch > bottompitch) continue;
 					}
+					else continue;					// shot over the thing
 				}
 				else continue;					// shot over the thing
 			}
@@ -4165,6 +4166,7 @@ struct aim_t
 						thingbottompitch = -VecToAngle(exitdist, th->Z() - shootz);
 						if (thingbottompitch < toppitch) continue;
 					}
+					else continue;					// shot over the thing
 				}
 				continue;					// shot under the thing
 			}

src/rendering/swrenderer/plane/r_flatplane.cpp

@@ -191,13 +191,21 @@ namespace swrenderer
 
 		if (r_dynlights)
 		{
+			int tx = x1;
+			bool mirror = !!(Thread->Portal->MirrorFlags & RF_XFLIP);
+			if (mirror)
+				tx = viewwidth - tx - 1;
+
 			// Find row position in view space
 			float zspan = (float)(planeheight / (fabs(y + 0.5 - viewport->CenterY) / viewport->InvZtoScale));
-			drawerargs.dc_viewpos.X = (float)((x1 + 0.5 - viewport->CenterX) / viewport->CenterX * zspan);
+			drawerargs.dc_viewpos.X = (float)((tx + 0.5 - viewport->CenterX) / viewport->CenterX * zspan);
 			drawerargs.dc_viewpos.Y = zspan;
 			drawerargs.dc_viewpos.Z = (float)((viewport->CenterY - y - 0.5) / viewport->InvZtoScale * zspan);
 			drawerargs.dc_viewpos_step.X = (float)(zspan / viewport->CenterX);
 
+			if (mirror)
+				drawerargs.dc_viewpos_step.X = -drawerargs.dc_viewpos_step.X;
+
 			// Plane normal
 			drawerargs.dc_normal.X = 0.0f;
 			drawerargs.dc_normal.Y = 0.0f;

src/rendering/swrenderer/viewport/r_viewport.cpp

@@ -62,6 +62,10 @@ namespace swrenderer
 	void RenderViewport::SetupPolyViewport(RenderThread *thread)
 	{
 		WorldToView = SoftwareWorldToView(viewpoint);
+
+		if (thread->Portal->MirrorFlags & RF_XFLIP)
+			WorldToView = Mat4f::Scale(-1.0f, 1.0f, 1.0f) * WorldToView;
+
 		ViewToClip = SoftwareViewToClip();
 		WorldToClip = ViewToClip * WorldToView;
 	}

src/version.h

@@ -96,14 +96,9 @@ const char *GetVersionString();
 #define OPTIONALWAD "zd_extra.pk3"
 
 // More stuff that needs to be different for derivatives.
-<<<<<<< HEAD
 #define GAMENAME "QZDoom"
+#define WGAMENAME L"QZDoom"
 #define GAMENAMELOWERCASE "qzdoom"
-=======
-#define GAMENAME "GZDoom"
-#define WGAMENAME L"GZDoom"
-#define GAMENAMELOWERCASE "gzdoom"
->>>>>>> 86a4aea6503864509a80f65fff5ae52df11abd0a
 #define FORUM_URL "http://forum.zdoom.org/"
 #define BUGS_FORUM_URL	"http://forum.zdoom.org/viewforum.php?f=2"
 

wadsrc/static/zscript/actors/doom/weaponfist.zs

@@ -65,7 +65,7 @@ extend class Actor
 			damage *= 10;
 
 		double ang = angle + Random2[Punch]() * (5.625 / 256);
-		double pitch = AimLineAttack (ang, DEFMELEERANGE);
+		double pitch = AimLineAttack (ang, DEFMELEERANGE, null, 0., ALF_CHECK3D);
 
 		LineAttack (ang, DEFMELEERANGE, pitch, damage, 'Melee', "BulletPuff", LAF_ISMELEEATTACK, t);
 

wadsrc/static/zscript/actors/hexen/clericmace.zs

@@ -66,7 +66,7 @@ class CWeapMace : ClericWeapon
 			for (int j = 1; j >= -1; j -= 2)
 			{
 				double ang = angle + j*i*(45. / 16);
-				double slope = AimLineAttack(ang, 2 * DEFMELEERANGE, t);
+				double slope = AimLineAttack(ang, 2 * DEFMELEERANGE, t, 0., ALF_CHECK3D);
 				if (t.linetarget)
 				{
 					LineAttack(ang, 2 * DEFMELEERANGE, slope, damage, 'Melee', "HammerPuff", true, t);
@@ -81,7 +81,7 @@ class CWeapMace : ClericWeapon
 		// didn't find any creatures, so try to strike any walls
 		weaponspecial = 0;
 
-		double slope = AimLineAttack (angle, DEFMELEERANGE);
+		double slope = AimLineAttack (angle, DEFMELEERANGE, null, 0., ALF_CHECK3D);
 		LineAttack (angle, DEFMELEERANGE, slope, damage, 'Melee', "HammerPuff");
 	}
 }

wadsrc/static/zscript/actors/hexen/fighteraxe.zs

@@ -245,7 +245,7 @@ class FWeapAxe : FighterWeapon
 			for (int j = 1; j >= -1; j -= 2)
 			{
 				double ang = angle + j*i*(45. / 16);
-				double slope = AimLineAttack(ang, AXERANGE, t);
+				double slope = AimLineAttack(ang, AXERANGE, t, 0., ALF_CHECK3D);
 				if (t.linetarget)
 				{
 					LineAttack(ang, AXERANGE, slope, damage, 'Melee', pufftype, true, t);
@@ -273,7 +273,7 @@ class FWeapAxe : FighterWeapon
 		// didn't find any creatures, so try to strike any walls
 		self.weaponspecial = 0;
 
-		double slope = AimLineAttack (angle, DEFMELEERANGE);
+		double slope = AimLineAttack (angle, DEFMELEERANGE, null, 0., ALF_CHECK3D);
 		LineAttack (angle, DEFMELEERANGE, slope, damage, 'Melee', pufftype, true);
 	}
 }

wadsrc/static/zscript/actors/hexen/fighterfist.zs

@@ -56,7 +56,7 @@ class FWeapFist : FighterWeapon
 		Class<Actor> pufftype;
 		FTranslatedLineTarget t;
 
-		double slope = AimLineAttack (angle, 2*DEFMELEERANGE, t);
+		double slope = AimLineAttack (angle, 2*DEFMELEERANGE, t, 0., ALF_CHECK3D);
 		if (t.linetarget != null)
 		{
 			if (++weaponspecial >= 3)
@@ -117,7 +117,7 @@ class FWeapFist : FighterWeapon
 		// didn't find any creatures, so try to strike any walls
 		weaponspecial = 0;
 
-		double slope = AimLineAttack (angle, DEFMELEERANGE);
+		double slope = AimLineAttack (angle, DEFMELEERANGE, null, 0., ALF_CHECK3D);
 		LineAttack (angle, DEFMELEERANGE, slope, damage, 'Melee', "PunchPuff", true);
 	}