From f2ec266eec6cff1ee1353eda952989533acf2e43 Mon Sep 17 00:00:00 2001
From: Major Cooke <paul.growney22@gmail.com>
Date: Tue, 15 Nov 2016 11:38:03 -0600
Subject: [PATCH 1/4] Fixed: Actors with NOINTERACTION shouldn't waste time
 continuously applying NOBLOCKMAP if it has it already and not moving.

---
 src/p_mobj.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/p_mobj.cpp b/src/p_mobj.cpp
index 3e20118784..2183f8cb9c 100644
--- a/src/p_mobj.cpp
+++ b/src/p_mobj.cpp
@@ -3373,11 +3373,14 @@ void AActor::Tick ()
 			}
 		}
 
-		UnlinkFromWorld ();
-		flags |= MF_NOBLOCKMAP;
-		SetXYZ(Vec3Offset(Vel));
-		CheckPortalTransition(false);
-		LinkToWorld ();
+		if (!Vel.isZero() || !(flags & MF_NOBLOCKMAP))
+		{
+			UnlinkFromWorld();
+			flags |= MF_NOBLOCKMAP;
+			SetXYZ(Vec3Offset(Vel));
+			CheckPortalTransition(false);
+			LinkToWorld();
+		}
 	}
 	else
 	{

From 3b240b73e9585b963a76f77c00ec617fe1a4bd1b Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 19 Nov 2016 12:40:08 +0200
Subject: [PATCH 2/4] Fixed endianness issue with saved games

See http://forum.zdoom.org/viewtopic.php?t=54272
---
 src/resourcefiles/file_zip.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/resourcefiles/file_zip.cpp b/src/resourcefiles/file_zip.cpp
index 8713fe554a..8011d56cfe 100644
--- a/src/resourcefiles/file_zip.cpp
+++ b/src/resourcefiles/file_zip.cpp
@@ -577,7 +577,7 @@ bool WriteZip(const char *filename, TArray<FString> &filenames, TArray<FCompress
 		dirend.DiskNumber = 0;
 		dirend.FirstDisk = 0;
 		dirend.NumEntriesOnAllDisks = dirend.NumEntries = LittleShort(filenames.Size());
-		dirend.DirectoryOffset = dirofs;
+		dirend.DirectoryOffset = LittleLong(dirofs);
 		dirend.DirectorySize = LittleLong(ftell(f) - dirofs);
 		dirend.ZipCommentLength = 0;
 		if (fwrite(&dirend, sizeof(dirend), 1, f) != 1)

From 60ac12be0ac5d3d47bc7f1d72e1b5ccd6544bd60 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 19 Nov 2016 12:41:01 +0200
Subject: [PATCH 3/4] Fixed compilation warnings in Cocoa backend

---
 src/posix/cocoa/i_input.mm     | 2 +-
 src/posix/cocoa/i_joystick.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/posix/cocoa/i_input.mm b/src/posix/cocoa/i_input.mm
index 3bbf42a9ad..7032806158 100644
--- a/src/posix/cocoa/i_input.mm
+++ b/src/posix/cocoa/i_input.mm
@@ -526,7 +526,7 @@ void ProcessMouseMoveInGame(NSEvent* theEvent)
 	lastX = x;
 	lastY = y;
 
-	if (0 != event.x | 0 != event.y)
+	if (0 != event.x || 0 != event.y)
 	{
 		event.type = EV_Mouse;
 		
diff --git a/src/posix/cocoa/i_joystick.cpp b/src/posix/cocoa/i_joystick.cpp
index c4bcc85c3e..747cc14226 100644
--- a/src/posix/cocoa/i_joystick.cpp
+++ b/src/posix/cocoa/i_joystick.cpp
@@ -1018,7 +1018,7 @@ IOKitJoystickManager::~IOKitJoystickManager()
 		if (0 != notification)
 		{
 			IOObjectRelease(notification);
-			notification = NULL;
+			notification = 0;
 		}
 	}
 }

From c28bcca3f3504b97fa791be56b83e1f679cfbb5b Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 19 Nov 2016 12:44:35 +0200
Subject: [PATCH 4/4] Print unknown if release information is unavailable on
 macOS

At least 10.4 Tiger doesn't support required sysctl name
---
 src/posix/cocoa/i_main.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm
index d8f0e74cf8..851e72e484 100644
--- a/src/posix/cocoa/i_main.mm
+++ b/src/posix/cocoa/i_main.mm
@@ -156,7 +156,7 @@ static void I_DetectOS()
 		case 12: name = "macOS Sierra";          break;
 	}
 
-	char release[16] = {};
+	char release[16] = "unknown";
 	size_t size = sizeof release - 1;
 	sysctlbyname("kern.osversion", release, &size, nullptr, 0);