From a2faa975cb67c6110ec7ef4a281271758ae09588 Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Fri, 20 Dec 2019 16:39:19 -0600
Subject: [PATCH 01/28] Allow Clipboard actions.

---
 src/m_menu.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/m_menu.c b/src/m_menu.c
index e367041e0..eb9bbaffe 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10436,6 +10436,28 @@ static void M_HandleConnectIP(INT32 choice)
 			if (l >= 28-1)
 				break;
 
+			const char *paste = I_ClipboardPaste(); // Paste clipboard into char
+
+			if ( ctrldown ) {
+				switch (choice) {
+					case 118: // ctrl+v, pasting
+						if (paste != NULL)
+							strcat(setupm_ip, paste); // Concat the ip field with clipboard
+						setupm_ip[127] = 0; // Truncate to maximum length
+						break;
+					case 99: // ctrl+c, copying
+						I_ClipboardCopy(setupm_ip, l);
+						break;
+					case 120: // ctrl+x, cutting
+						I_ClipboardCopy(setupm_ip, l);
+						setupm_ip[0] = 0;
+						break;
+					default: // otherwise do nothing
+						break;
+				}
+				break; // break
+			}
+
 			// Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
 			if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
 			{

From ed847e831b562ee86f4d1eba49013ba844d76d2b Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Fri, 20 Dec 2019 20:28:30 -0600
Subject: [PATCH 02/28] Fix pasting going out of bounds and dash the
 possibility of memory leaks while pasting.

---
 src/m_menu.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index eb9bbaffe..ad0f70eb2 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10436,14 +10436,16 @@ static void M_HandleConnectIP(INT32 choice)
 			if (l >= 28-1)
 				break;
 
-			const char *paste = I_ClipboardPaste(); // Paste clipboard into char
+			char *paste = (char *)I_ClipboardPaste(); // Paste clipboard into char
 
 			if ( ctrldown ) {
 				switch (choice) {
 					case 118: // ctrl+v, pasting
-						if (paste != NULL)
+						if (paste != NULL) {
+							if (strlen(paste) + strlen(setupm_ip) >= 28-1)
+								paste[28-1 - strlen(setupm_ip)] = 0;
 							strcat(setupm_ip, paste); // Concat the ip field with clipboard
-						setupm_ip[127] = 0; // Truncate to maximum length
+						}
 						break;
 					case 99: // ctrl+c, copying
 						I_ClipboardCopy(setupm_ip, l);

From 1f93ab0e0ffe5c19dee2fa1c47f1dbe0c161d207 Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Mon, 23 Dec 2019 18:53:41 -0600
Subject: [PATCH 03/28] Optimise further, play beep on cut/copy, play beep when
 paste is successful.

---
 src/m_menu.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index ad0f70eb2..fed0d65b1 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10433,33 +10433,42 @@ static void M_HandleConnectIP(INT32 choice)
 
 		default:
 			l = strlen(setupm_ip);
-			if (l >= 28-1)
-				break;
-
-			char *paste = (char *)I_ClipboardPaste(); // Paste clipboard into char
 
 			if ( ctrldown ) {
 				switch (choice) {
 					case 118: // ctrl+v, pasting
+						;
+						char *paste = (char *)I_ClipboardPaste(); // Paste clipboard into char
+
 						if (paste != NULL) {
-							if (strlen(paste) + strlen(setupm_ip) >= 28-1)
-								paste[28-1 - strlen(setupm_ip)] = 0;
+							if (strlen(paste) + l >= 28-1)
+								paste[28-1 - l] = 0;
 							strcat(setupm_ip, paste); // Concat the ip field with clipboard
+							if (strlen(paste) != 0) // Don't play sound if nothing was pasted
+								S_StartSound(NULL,sfx_menu1); // Tails
 						}
 						break;
+
 					case 99: // ctrl+c, copying
 						I_ClipboardCopy(setupm_ip, l);
+						S_StartSound(NULL,sfx_menu1); // Tails
 						break;
+
 					case 120: // ctrl+x, cutting
 						I_ClipboardCopy(setupm_ip, l);
+						S_StartSound(NULL,sfx_menu1); // Tails
 						setupm_ip[0] = 0;
 						break;
+
 					default: // otherwise do nothing
 						break;
 				}
-				break; // break
+				break; // don't check for typed keys
 			}
 
+			if (l >= 28-1)
+				break;
+
 			// Rudimentary number and period enforcing - also allows letters so hostnames can be used instead
 			if ((choice >= '-' && choice <= ':') || (choice >= 'A' && choice <= 'Z') || (choice >= 'a' && choice <= 'z'))
 			{

From ae9adce873cbb4938a34657d783286fa14469c8a Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Sun, 29 Dec 2019 18:26:56 -0600
Subject: [PATCH 04/28] Replace magic numbers with less magic and more readable
 chars.

---
 src/m_menu.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index fed0d65b1..e1e28b671 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10436,7 +10436,8 @@ static void M_HandleConnectIP(INT32 choice)
 
 			if ( ctrldown ) {
 				switch (choice) {
-					case 118: // ctrl+v, pasting
+					case 'v':
+					case 'V': // ctrl+v, pasting
 						;
 						char *paste = (char *)I_ClipboardPaste(); // Paste clipboard into char
 
@@ -10448,13 +10449,15 @@ static void M_HandleConnectIP(INT32 choice)
 								S_StartSound(NULL,sfx_menu1); // Tails
 						}
 						break;
-
-					case 99: // ctrl+c, copying
+						
+					case 'c':
+					case 'C': // ctrl+c, copying
 						I_ClipboardCopy(setupm_ip, l);
 						S_StartSound(NULL,sfx_menu1); // Tails
 						break;
 
-					case 120: // ctrl+x, cutting
+					case 'x':
+					case 'X': // ctrl+x, cutting
 						I_ClipboardCopy(setupm_ip, l);
 						S_StartSound(NULL,sfx_menu1); // Tails
 						setupm_ip[0] = 0;

From 9d701d722ebd08d4939ea43e195a5f0325338e0a Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Sun, 29 Dec 2019 20:15:18 -0600
Subject: [PATCH 05/28] Reverted to better, less complex system, and added
 support for Shift+Insert and Shift+Delete.

Major thanks to James for helping me.
Turns out that strncpy thwarts the memory leaks for me. Silly, me!
---
 src/m_menu.c | 46 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index e1e28b671..ef9335907 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10424,13 +10424,15 @@ static void M_HandleConnectIP(INT32 choice)
 			break;
 
 		case KEY_DEL:
-			if (setupm_ip[0])
+			if (setupm_ip[0] && !shiftdown) // Shift+Delete is used for something else.
 			{
 				S_StartSound(NULL,sfx_menu1); // Tails
 				setupm_ip[0] = 0;
 			}
-			break;
-
+			if (!shiftdown) // Shift+Delete is used for something else.
+				break;
+			
+			/* FALLTHRU */
 		default:
 			l = strlen(setupm_ip);
 
@@ -10438,18 +10440,17 @@ static void M_HandleConnectIP(INT32 choice)
 				switch (choice) {
 					case 'v':
 					case 'V': // ctrl+v, pasting
-						;
-						char *paste = (char *)I_ClipboardPaste(); // Paste clipboard into char
-
+					{
+						const char *paste = I_ClipboardPaste();
+						
 						if (paste != NULL) {
-							if (strlen(paste) + l >= 28-1)
-								paste[28-1 - l] = 0;
-							strcat(setupm_ip, paste); // Concat the ip field with clipboard
+							strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
 							if (strlen(paste) != 0) // Don't play sound if nothing was pasted
 								S_StartSound(NULL,sfx_menu1); // Tails
 						}
+
 						break;
-						
+					}
 					case 'c':
 					case 'C': // ctrl+c, copying
 						I_ClipboardCopy(setupm_ip, l);
@@ -10469,6 +10470,31 @@ static void M_HandleConnectIP(INT32 choice)
 				break; // don't check for typed keys
 			}
 
+			if ( shiftdown ) {
+				switch (choice) {
+					case KEY_INS:
+						{
+							const char *paste = I_ClipboardPaste();
+							
+							if (paste != NULL) {
+								strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
+								if (strlen(paste) != 0) // Don't play sound if nothing was pasted
+									S_StartSound(NULL,sfx_menu1); // Tails
+							}
+
+							break;
+						}
+					case KEY_DEL: // shift+delete, cutting
+						I_ClipboardCopy(setupm_ip, l);
+						S_StartSound(NULL,sfx_menu1); // Tails
+						setupm_ip[0] = 0;
+						break;
+					default: // otherwise do nothing.
+						break;
+				}
+				break; // don't check for typed keys
+			}
+
 			if (l >= 28-1)
 				break;
 

From bc88def2254afd6d24f6503fddf49f008b811bc9 Mon Sep 17 00:00:00 2001
From: GoldenTails <milestailsprower101n2@gmail.com>
Date: Sun, 29 Dec 2019 20:22:58 -0600
Subject: [PATCH 06/28] Slap in some Ctrl+Insert (copy) support too while I'm
 at it.

Also added a comment but you didn't see that.
---
 src/m_menu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index ef9335907..e9cbe9980 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10431,7 +10431,7 @@ static void M_HandleConnectIP(INT32 choice)
 			}
 			if (!shiftdown) // Shift+Delete is used for something else.
 				break;
-			
+
 			/* FALLTHRU */
 		default:
 			l = strlen(setupm_ip);
@@ -10451,8 +10451,9 @@ static void M_HandleConnectIP(INT32 choice)
 
 						break;
 					}
+					case KEY_INS:
 					case 'c':
-					case 'C': // ctrl+c, copying
+					case 'C': // ctrl+c, ctrl+insert, copying
 						I_ClipboardCopy(setupm_ip, l);
 						S_StartSound(NULL,sfx_menu1); // Tails
 						break;
@@ -10472,7 +10473,7 @@ static void M_HandleConnectIP(INT32 choice)
 
 			if ( shiftdown ) {
 				switch (choice) {
-					case KEY_INS:
+					case KEY_INS: // shift+insert, pasting
 						{
 							const char *paste = I_ClipboardPaste();
 							

From 58dd578b094639405d452593562e0f8cb2b482ce Mon Sep 17 00:00:00 2001
From: Nami <50415197+namishere@users.noreply.github.com>
Date: Sun, 29 Dec 2019 20:36:24 -0800
Subject: [PATCH 07/28] Let's try this again!

---
 src/dehacked.c        |  3 +++
 src/lua_blockmaplib.c | 40 ++++++++++++++++++----------------------
 src/lua_hook.h        |  6 ++++--
 src/lua_hooklib.c     | 34 +++++++++++++++++++++++++++++-----
 src/p_tick.c          |  8 ++++++--
 5 files changed, 60 insertions(+), 31 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 4c90211cc..450e33c16 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -9824,6 +9824,9 @@ struct {
 	{"TC_RAINBOW",TC_RAINBOW},
 	{"TC_BLINK",TC_BLINK},
 	{"TC_DASHMODE",TC_DASHMODE},
+
+	{"OPT_LINES", 1},
+	{"OPT_MOBJS", 1<<1},
 #endif
 
 	{NULL,0}
diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c
index 7f7dc9560..2130e9333 100644
--- a/src/lua_blockmaplib.c
+++ b/src/lua_blockmaplib.c
@@ -18,11 +18,6 @@
 #include "lua_libs.h"
 //#include "lua_hud.h" // hud_running errors
 
-static const char *const search_opt[] = {
-	"objects",
-	"lines",
-	NULL};
-
 // a quickly-made function pointer typedef used by lib_searchBlockmap...
 // return values:
 // 0 - normal, no interruptions
@@ -179,29 +174,18 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
 //   false = searching of at least one block stopped mid-way (including if the whole search was stopped)
 static int lib_searchBlockmap(lua_State *L)
 {
-	int searchtype = luaL_checkoption(L, 1, "objects", search_opt);
 	int n;
 	mobj_t *mobj;
 	INT32 xl, xh, yl, yh, bx, by;
 	fixed_t x1, x2, y1, y2;
 	boolean retval = true;
+	boolean repeat = false;
 	UINT8 funcret = 0;
-	blockmap_func searchFunc;
 
-	lua_remove(L, 1); // remove searchtype, stack is now function, mobj, [x1, x2, y1, y2]
+	UINT32 flags = luaL_checkinteger(L, 1);
+	lua_remove(L, 1); // remove flags, stack is now function, mobj, [x1, x2, y1, y2]
 	luaL_checktype(L, 1, LUA_TFUNCTION);
 
-	switch (searchtype)
-	{
-		case 0: // "objects"
-		default:
-			searchFunc = lib_searchBlockmap_Objects;
-			break;
-		case 1: // "lines"
-			searchFunc = lib_searchBlockmap_Lines;
-			break;
-	}
-
 	// the mobj we are searching around, the "calling" mobj we could say
 	mobj = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
 	if (!mobj)
@@ -240,8 +224,14 @@ static int lib_searchBlockmap(lua_State *L)
 	validcount++;
 	for (bx = xl; bx <= xh; bx++)
 		for (by = yl; by <= yh; by++)
-		{
-			funcret = searchFunc(L, bx, by, mobj);
+		{	
+			if (flags & (OPT_LINES|OPT_MOBJS))
+				repeat = true;
+			if (flags & OPT_LINES)
+				funcret = lib_searchBlockmap_Lines(L, bx, by, mobj);
+			else
+				funcret = lib_searchBlockmap_Objects(L, bx, by, mobj);
+			doitagain:
 			// return value of searchFunc determines searchFunc's return value and/or when to stop
 			if (funcret == 2){ // stop whole search
 				lua_pushboolean(L, false); // return false
@@ -254,6 +244,12 @@ static int lib_searchBlockmap(lua_State *L)
 				lua_pushboolean(L, false); // in which case we have to stop now regardless
 				return 1;
 			}
+			if (repeat)
+			{
+				funcret = lib_searchBlockmap_Objects(L, bx, by, mobj);
+				repeat = false;
+				goto doitagain;
+			}
 		}
 	lua_pushboolean(L, retval);
 	return 1;
@@ -265,4 +261,4 @@ int LUA_BlockmapLib(lua_State *L)
 	return 0;
 }
 
-#endif
+#endif
\ No newline at end of file
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 68efbce93..620a7b307 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -20,7 +20,8 @@ enum hook {
 	hook_MapChange,
 	hook_MapLoad,
 	hook_PlayerJoin,
-	hook_ThinkFrame,
+	hook_PreThinkFrame,
+	hook_PostThinkFrame,
 	hook_MobjSpawn,
 	hook_MobjCollide,
 	hook_MobjMoveCollide,
@@ -61,7 +62,8 @@ extern const char *const hookNames[];
 void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load)
 void LUAh_MapLoad(void); // Hook for map load
 void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer
-void LUAh_ThinkFrame(void); // Hook for frame (after mobj and player thinkers)
+void LUAh_PreThinkFrame(void); // Hook for frame (before mobj and player thinkers)
+void LUAh_PostThinkFrame(void); // Hook for frame (after mobj and player thinkers)
 boolean LUAh_MobjHook(mobj_t *mo, enum hook which);
 boolean LUAh_PlayerHook(player_t *plr, enum hook which);
 #define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 91b4c6992..ace0f14d5 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -31,7 +31,8 @@ const char *const hookNames[hook_MAX+1] = {
 	"MapChange",
 	"MapLoad",
 	"PlayerJoin",
-	"ThinkFrame",
+	"PreThinkFrame",
+	"PostThinkFrame",
 	"MobjSpawn",
 	"MobjCollide",
 	"MobjMoveCollide",
@@ -411,16 +412,39 @@ void LUAh_PlayerJoin(int playernum)
 	lua_settop(gL, 0);
 }
 
-// Hook for frame (after mobj and player thinkers)
-void LUAh_ThinkFrame(void)
+// Hook for frame (before mobj and player thinkers)
+void LUAh_PreThinkFrame(void)
 {
 	hook_p hookp;
-	if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
+	if (!gL || !(hooksAvailable[hook_PreThinkFrame/8] & (1<<(hook_PreThinkFrame%8))))
 		return;
 
 	for (hookp = roothook; hookp; hookp = hookp->next)
 	{
-		if (hookp->type != hook_ThinkFrame)
+		if (hookp->type != hook_PreThinkFrame)
+			continue;
+
+		lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+		lua_gettable(gL, LUA_REGISTRYINDEX);
+		if (lua_pcall(gL, 0, 0, 0)) {
+			if (!hookp->error || cv_debug & DBG_LUA)
+				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+			lua_pop(gL, 1);
+			hookp->error = true;
+		}
+	}
+}
+
+// Hook for frame (after mobj and player thinkers)
+void LUAh_PostThinkFrame(void)
+{
+	hook_p hookp;
+	if (!gL || !(hooksAvailable[hook_PostThinkFrame/8] & (1<<(hook_PostThinkFrame%8))))
+		return;
+
+	for (hookp = roothook; hookp; hookp = hookp->next)
+	{
+		if (hookp->type != hook_PostThinkFrame)
 			continue;
 
 		lua_pushfstring(gL, FMT_HOOKID, hookp->id);
diff --git a/src/p_tick.c b/src/p_tick.c
index e0f60bd22..b92465fe4 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -646,6 +646,10 @@ void P_Ticker(boolean run)
 
 	if (run)
 	{
+		#ifdef HAVE_BLUA
+		LUAh_PreThinkFrame();
+		#endif
+
 		P_RunThinkers();
 
 		// Run any "after all the other thinkers" stuff
@@ -654,7 +658,7 @@ void P_Ticker(boolean run)
 				P_PlayerAfterThink(&players[i]);
 
 #ifdef HAVE_BLUA
-		LUAh_ThinkFrame();
+		LUAh_PostThinkFrame();
 #endif
 	}
 
@@ -769,7 +773,7 @@ void P_PreTicker(INT32 frames)
 				P_PlayerAfterThink(&players[i]);
 
 #ifdef HAVE_BLUA
-		LUAh_ThinkFrame();
+		LUAh_PostThinkFrame();
 #endif
 
 		// Run shield positioning

From a36920808b74e068d582dda5a3b75bdf64246463 Mon Sep 17 00:00:00 2001
From: Nami <50415197+namishere@users.noreply.github.com>
Date: Mon, 30 Dec 2019 19:04:27 -0800
Subject: [PATCH 08/28] Revert changes to searchBlockmap because on reflection,
 the benefits didn't outweigh breaking every current usage of it

Readd ThinkFrame in its original position
PostThinkFrame now runs at the end of P_Ticker, only MapEnd runs after it
---
 src/dehacked.c        |  3 ---
 src/lua_blockmaplib.c | 40 ++++++++++++++++++++++------------------
 src/lua_hook.h        |  4 +++-
 src/lua_hooklib.c     | 25 +++++++++++++++++++++++++
 src/p_tick.c          | 20 +++++++++++++++-----
 5 files changed, 65 insertions(+), 27 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 450e33c16..4c90211cc 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -9824,9 +9824,6 @@ struct {
 	{"TC_RAINBOW",TC_RAINBOW},
 	{"TC_BLINK",TC_BLINK},
 	{"TC_DASHMODE",TC_DASHMODE},
-
-	{"OPT_LINES", 1},
-	{"OPT_MOBJS", 1<<1},
 #endif
 
 	{NULL,0}
diff --git a/src/lua_blockmaplib.c b/src/lua_blockmaplib.c
index 2130e9333..7f7dc9560 100644
--- a/src/lua_blockmaplib.c
+++ b/src/lua_blockmaplib.c
@@ -18,6 +18,11 @@
 #include "lua_libs.h"
 //#include "lua_hud.h" // hud_running errors
 
+static const char *const search_opt[] = {
+	"objects",
+	"lines",
+	NULL};
+
 // a quickly-made function pointer typedef used by lib_searchBlockmap...
 // return values:
 // 0 - normal, no interruptions
@@ -174,18 +179,29 @@ static UINT8 lib_searchBlockmap_Lines(lua_State *L, INT32 x, INT32 y, mobj_t *th
 //   false = searching of at least one block stopped mid-way (including if the whole search was stopped)
 static int lib_searchBlockmap(lua_State *L)
 {
+	int searchtype = luaL_checkoption(L, 1, "objects", search_opt);
 	int n;
 	mobj_t *mobj;
 	INT32 xl, xh, yl, yh, bx, by;
 	fixed_t x1, x2, y1, y2;
 	boolean retval = true;
-	boolean repeat = false;
 	UINT8 funcret = 0;
+	blockmap_func searchFunc;
 
-	UINT32 flags = luaL_checkinteger(L, 1);
-	lua_remove(L, 1); // remove flags, stack is now function, mobj, [x1, x2, y1, y2]
+	lua_remove(L, 1); // remove searchtype, stack is now function, mobj, [x1, x2, y1, y2]
 	luaL_checktype(L, 1, LUA_TFUNCTION);
 
+	switch (searchtype)
+	{
+		case 0: // "objects"
+		default:
+			searchFunc = lib_searchBlockmap_Objects;
+			break;
+		case 1: // "lines"
+			searchFunc = lib_searchBlockmap_Lines;
+			break;
+	}
+
 	// the mobj we are searching around, the "calling" mobj we could say
 	mobj = *((mobj_t **)luaL_checkudata(L, 2, META_MOBJ));
 	if (!mobj)
@@ -224,14 +240,8 @@ static int lib_searchBlockmap(lua_State *L)
 	validcount++;
 	for (bx = xl; bx <= xh; bx++)
 		for (by = yl; by <= yh; by++)
-		{	
-			if (flags & (OPT_LINES|OPT_MOBJS))
-				repeat = true;
-			if (flags & OPT_LINES)
-				funcret = lib_searchBlockmap_Lines(L, bx, by, mobj);
-			else
-				funcret = lib_searchBlockmap_Objects(L, bx, by, mobj);
-			doitagain:
+		{
+			funcret = searchFunc(L, bx, by, mobj);
 			// return value of searchFunc determines searchFunc's return value and/or when to stop
 			if (funcret == 2){ // stop whole search
 				lua_pushboolean(L, false); // return false
@@ -244,12 +254,6 @@ static int lib_searchBlockmap(lua_State *L)
 				lua_pushboolean(L, false); // in which case we have to stop now regardless
 				return 1;
 			}
-			if (repeat)
-			{
-				funcret = lib_searchBlockmap_Objects(L, bx, by, mobj);
-				repeat = false;
-				goto doitagain;
-			}
 		}
 	lua_pushboolean(L, retval);
 	return 1;
@@ -261,4 +265,4 @@ int LUA_BlockmapLib(lua_State *L)
 	return 0;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/lua_hook.h b/src/lua_hook.h
index 620a7b307..d035be097 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -21,6 +21,7 @@ enum hook {
 	hook_MapLoad,
 	hook_PlayerJoin,
 	hook_PreThinkFrame,
+	hook_ThinkFrame,
 	hook_PostThinkFrame,
 	hook_MobjSpawn,
 	hook_MobjCollide,
@@ -63,7 +64,8 @@ void LUAh_MapChange(INT16 mapnumber); // Hook for map change (before load)
 void LUAh_MapLoad(void); // Hook for map load
 void LUAh_PlayerJoin(int playernum); // Hook for Got_AddPlayer
 void LUAh_PreThinkFrame(void); // Hook for frame (before mobj and player thinkers)
-void LUAh_PostThinkFrame(void); // Hook for frame (after mobj and player thinkers)
+void LUAh_ThinkFrame(void); // Hook for frame (after mobj and player thinkers)
+void LUAh_PostThinkFrame(void); // Hook for frame (at end of tick, ie after overlays, precipitation, specials)
 boolean LUAh_MobjHook(mobj_t *mo, enum hook which);
 boolean LUAh_PlayerHook(player_t *plr, enum hook which);
 #define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index ace0f14d5..d548f6a65 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -32,6 +32,7 @@ const char *const hookNames[hook_MAX+1] = {
 	"MapLoad",
 	"PlayerJoin",
 	"PreThinkFrame",
+	"ThinkFrame",
 	"PostThinkFrame",
 	"MobjSpawn",
 	"MobjCollide",
@@ -436,6 +437,30 @@ void LUAh_PreThinkFrame(void)
 }
 
 // Hook for frame (after mobj and player thinkers)
+void LUAh_ThinkFrame(void)
+{
+	hook_p hookp;
+	if (!gL || !(hooksAvailable[hook_ThinkFrame/8] & (1<<(hook_ThinkFrame%8))))
+		return;
+
+	for (hookp = roothook; hookp; hookp = hookp->next)
+	{
+		if (hookp->type != hook_ThinkFrame)
+			continue;
+
+		lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+		lua_gettable(gL, LUA_REGISTRYINDEX);
+		if (lua_pcall(gL, 0, 0, 0)) {
+			if (!hookp->error || cv_debug & DBG_LUA)
+				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+			lua_pop(gL, 1);
+			hookp->error = true;
+		}
+	}
+}
+
+
+// Hook for frame (at end of tick, ie after overlays, precipitation, specials)
 void LUAh_PostThinkFrame(void)
 {
 	hook_p hookp;
diff --git a/src/p_tick.c b/src/p_tick.c
index b92465fe4..e266f7013 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -646,9 +646,9 @@ void P_Ticker(boolean run)
 
 	if (run)
 	{
-		#ifdef HAVE_BLUA
+#ifdef HAVE_BLUA
 		LUAh_PreThinkFrame();
-		#endif
+#endif
 
 		P_RunThinkers();
 
@@ -658,7 +658,7 @@ void P_Ticker(boolean run)
 				P_PlayerAfterThink(&players[i]);
 
 #ifdef HAVE_BLUA
-		LUAh_PostThinkFrame();
+		LUAh_ThinkFrame();
 #endif
 	}
 
@@ -730,6 +730,10 @@ void P_Ticker(boolean run)
 			G_ConsGhostTic();
 		if (modeattacking)
 			G_GhostTicker();
+
+#ifdef HAVE_BLUA
+		LUAh_PostThinkFrame();
+#endif
 	}
 
 	P_MapEnd();
@@ -764,7 +768,9 @@ void P_PreTicker(INT32 frames)
 
 				memcpy(&players[i].cmd, &temptic, sizeof(ticcmd_t));
 			}
-
+#ifdef HAVE_BLUA
+		LUAh_PreThinkFrame();
+#endif
 		P_RunThinkers();
 
 		// Run any "after all the other thinkers" stuff
@@ -773,7 +779,7 @@ void P_PreTicker(INT32 frames)
 				P_PlayerAfterThink(&players[i]);
 
 #ifdef HAVE_BLUA
-		LUAh_PostThinkFrame();
+		LUAh_ThinkFrame();
 #endif
 
 		// Run shield positioning
@@ -783,6 +789,10 @@ void P_PreTicker(INT32 frames)
 		P_UpdateSpecials();
 		P_RespawnSpecials();
 
+#ifdef HAVE_BLUA
+		LUAh_PostThinkFrame();
+#endif
+
 		P_MapEnd();
 	}
 }

From 41c902b819ac8fdef173c4ba76a8c50ad8107190 Mon Sep 17 00:00:00 2001
From: Nami <50415197+namishere@users.noreply.github.com>
Date: Mon, 30 Dec 2019 19:11:49 -0800
Subject: [PATCH 09/28] Move PreThinkFrame hook back a bit, now runs before
 PlayerThink

---
 src/p_tick.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/p_tick.c b/src/p_tick.c
index e266f7013..13209c3f9 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -629,6 +629,10 @@ void P_Ticker(boolean run)
 		if (demoplayback)
 			G_ReadDemoTiccmd(&players[consoleplayer].cmd, 0);
 
+		#ifdef HAVE_BLUA
+		LUAh_PreThinkFrame();
+		#endif
+
 		for (i = 0; i < MAXPLAYERS; i++)
 			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
 				P_PlayerThink(&players[i]);
@@ -753,6 +757,9 @@ void P_PreTicker(INT32 frames)
 	{
 		P_MapStart();
 
+#ifdef HAVE_BLUA
+		LUAh_PreThinkFrame();
+#endif
 		for (i = 0; i < MAXPLAYERS; i++)
 			if (playeringame[i] && players[i].mo && !P_MobjWasRemoved(players[i].mo))
 			{
@@ -768,9 +775,7 @@ void P_PreTicker(INT32 frames)
 
 				memcpy(&players[i].cmd, &temptic, sizeof(ticcmd_t));
 			}
-#ifdef HAVE_BLUA
-		LUAh_PreThinkFrame();
-#endif
+
 		P_RunThinkers();
 
 		// Run any "after all the other thinkers" stuff

From 60928db0e0b08fee7ceddd5515adf2246bb655c3 Mon Sep 17 00:00:00 2001
From: Nami <50415197+namishere@users.noreply.github.com>
Date: Mon, 30 Dec 2019 19:22:12 -0800
Subject: [PATCH 10/28] I removed a hook I left behind and forgot to save the
 change before committing :upside_down:

---
 src/p_tick.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/p_tick.c b/src/p_tick.c
index 13209c3f9..9b56ee1c2 100644
--- a/src/p_tick.c
+++ b/src/p_tick.c
@@ -650,10 +650,6 @@ void P_Ticker(boolean run)
 
 	if (run)
 	{
-#ifdef HAVE_BLUA
-		LUAh_PreThinkFrame();
-#endif
-
 		P_RunThinkers();
 
 		// Run any "after all the other thinkers" stuff

From ef4840555e2c52a781e69ade5c56a88f70963af9 Mon Sep 17 00:00:00 2001
From: Nami <50415197+namishere@users.noreply.github.com>
Date: Tue, 31 Dec 2019 15:17:02 -0800
Subject: [PATCH 11/28] Add MobjLineCollide hook

---
 src/lua_hook.h    |  3 ++
 src/lua_hooklib.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 src/p_map.c       | 11 +++++++
 3 files changed, 95 insertions(+)

diff --git a/src/lua_hook.h b/src/lua_hook.h
index d035be097..6f8805708 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -25,6 +25,7 @@ enum hook {
 	hook_PostThinkFrame,
 	hook_MobjSpawn,
 	hook_MobjCollide,
+	hook_MobjLineCollide,
 	hook_MobjMoveCollide,
 	hook_TouchSpecial,
 	hook_MobjFuse,
@@ -70,7 +71,9 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which);
 boolean LUAh_PlayerHook(player_t *plr, enum hook which);
 #define LUAh_MobjSpawn(mo) LUAh_MobjHook(mo, hook_MobjSpawn) // Hook for P_SpawnMobj by mobj type
 UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which);
+UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which);
 #define LUAh_MobjCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjCollide) // Hook for PIT_CheckThing by (thing) mobj type
+#define LUAh_MobjLineCollide(thing, line) LUAh_MobjLineCollideHook(thing, line, hook_MobjLineCollide) // Hook for PIT_CheckThing by (thing) mobj type
 #define LUAh_MobjMoveCollide(thing1, thing2) LUAh_MobjCollideHook(thing1, thing2, hook_MobjMoveCollide) // Hook for PIT_CheckThing by (tmthing) mobj type
 boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher); // Hook for P_TouchSpecialThing by mobj type
 #define LUAh_MobjFuse(mo) LUAh_MobjHook(mo, hook_MobjFuse) // Hook for mobj->fuse == 0 by mobj type
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index d548f6a65..2d9a98c4b 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -36,6 +36,7 @@ const char *const hookNames[hook_MAX+1] = {
 	"PostThinkFrame",
 	"MobjSpawn",
 	"MobjCollide",
+	"MobjLineCollide",
 	"MobjMoveCollide",
 	"TouchSpecial",
 	"MobjFuse",
@@ -125,6 +126,7 @@ static int lib_addHook(lua_State *L)
 	// Take a mobjtype enum which this hook is specifically for.
 	case hook_MobjSpawn:
 	case hook_MobjCollide:
+	case hook_MobjLineCollide:
 	case hook_MobjMoveCollide:
 	case hook_TouchSpecial:
 	case hook_MobjFuse:
@@ -184,6 +186,7 @@ static int lib_addHook(lua_State *L)
 		lastp = &mobjthinkerhooks[hook.s.mt];
 		break;
 	case hook_MobjCollide:
+	case hook_MobjLineCollide:
 	case hook_MobjMoveCollide:
 		lastp = &mobjcollidehooks[hook.s.mt];
 		break;
@@ -562,6 +565,84 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
 	return shouldCollide;
 }
 
+UINT8 LUAh_MobjLineCollideHook(mobj_t *thing, line_t *line, enum hook which)
+{
+	hook_p hookp;
+	UINT8 shouldCollide = 0; // 0 = default, 1 = force yes, 2 = force no.
+	if (!gL || !(hooksAvailable[which/8] & (1<<(which%8))))
+		return 0;
+
+	I_Assert(thing->type < NUMMOBJTYPES);
+
+	lua_settop(gL, 0);
+
+	// Look for all generic mobj collision hooks
+	for (hookp = mobjcollidehooks[MT_NULL]; hookp; hookp = hookp->next)
+	{
+		if (hookp->type != which)
+			continue;
+
+		if (lua_gettop(gL) == 0)
+		{
+			LUA_PushUserdata(gL, thing, META_MOBJ);
+			LUA_PushUserdata(gL, line, META_LINE);
+		}
+		lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+		lua_gettable(gL, LUA_REGISTRYINDEX);
+		lua_pushvalue(gL, -3);
+		lua_pushvalue(gL, -3);
+		if (lua_pcall(gL, 2, 1, 0)) {
+			if (!hookp->error || cv_debug & DBG_LUA)
+				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+			lua_pop(gL, 1);
+			hookp->error = true;
+			continue;
+		}
+		if (!lua_isnil(gL, -1))
+		{ // if nil, leave shouldCollide = 0.
+			if (lua_toboolean(gL, -1))
+				shouldCollide = 1; // Force yes
+			else
+				shouldCollide = 2; // Force no
+		}
+		lua_pop(gL, 1);
+	}
+
+	for (hookp = mobjcollidehooks[thing->type]; hookp; hookp = hookp->next)
+	{
+		if (hookp->type != which)
+			continue;
+
+		if (lua_gettop(gL) == 0)
+		{
+			LUA_PushUserdata(gL, thing, META_MOBJ);
+			LUA_PushUserdata(gL, line, META_LINE);
+		}
+		lua_pushfstring(gL, FMT_HOOKID, hookp->id);
+		lua_gettable(gL, LUA_REGISTRYINDEX);
+		lua_pushvalue(gL, -3);
+		lua_pushvalue(gL, -3);
+		if (lua_pcall(gL, 2, 1, 0)) {
+			if (!hookp->error || cv_debug & DBG_LUA)
+				CONS_Alert(CONS_WARNING,"%s\n",lua_tostring(gL, -1));
+			lua_pop(gL, 1);
+			hookp->error = true;
+			continue;
+		}
+		if (!lua_isnil(gL, -1))
+		{ // if nil, leave shouldCollide = 0.
+			if (lua_toboolean(gL, -1))
+				shouldCollide = 1; // Force yes
+			else
+				shouldCollide = 2; // Force no
+		}
+		lua_pop(gL, 1);
+	}
+
+	lua_settop(gL, 0);
+	return shouldCollide;
+}
+
 // Hook for mobj thinkers
 boolean LUAh_MobjThinker(mobj_t *mo)
 {
diff --git a/src/p_map.c b/src/p_map.c
index 1b6f23cde..628268bff 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1988,6 +1988,17 @@ static boolean PIT_CheckLine(line_t *ld)
 	if (lowfloor < tmdropoffz)
 		tmdropoffz = lowfloor;
 
+#ifdef HAVE_BLUA
+	{
+		UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, ld); // checks hook for thing's type
+		if (P_MobjWasRemoved(tmthing))
+			return true; // one of them was removed???
+		if (shouldCollide == 1)
+			return false; // force collide
+		else if (shouldCollide == 2)
+			return true; // force no collide
+	}
+#endif
 	return true;
 }
 

From ad610ba4aa65ead17d1a9696bbc76077ea3dd830 Mon Sep 17 00:00:00 2001
From: Nami <50415197+namishere@users.noreply.github.com>
Date: Wed, 1 Jan 2020 19:38:48 -0800
Subject: [PATCH 12/28] Move MobjLineCollide up a bit to where we first know
 for sure that we hit a line

---
 src/p_map.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/p_map.c b/src/p_map.c
index 628268bff..4cc591330 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1943,6 +1943,19 @@ static boolean PIT_CheckLine(line_t *ld)
 
 	// this line is out of the if so upper and lower textures can be hit by a splat
 	blockingline = ld;
+
+#ifdef HAVE_BLUA
+	{
+		UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, blockingline); // checks hook for thing's type
+		if (P_MobjWasRemoved(tmthing))
+			return true; // one of them was removed???
+		if (shouldCollide == 1)
+			return false; // force collide
+		else if (shouldCollide == 2)
+			return true; // force no collide
+	}
+#endif
+
 	if (!ld->backsector) // one sided line
 	{
 		if (P_PointOnLineSide(tmthing->x, tmthing->y, ld))
@@ -1987,18 +2000,7 @@ static boolean PIT_CheckLine(line_t *ld)
 
 	if (lowfloor < tmdropoffz)
 		tmdropoffz = lowfloor;
-
-#ifdef HAVE_BLUA
-	{
-		UINT8 shouldCollide = LUAh_MobjLineCollide(tmthing, ld); // checks hook for thing's type
-		if (P_MobjWasRemoved(tmthing))
-			return true; // one of them was removed???
-		if (shouldCollide == 1)
-			return false; // force collide
-		else if (shouldCollide == 2)
-			return true; // force no collide
-	}
-#endif
+	
 	return true;
 }
 

From 658b8dcfa95935bbaef92c15476ad57ecc96950f Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Thu, 2 Jan 2020 15:45:13 -0800
Subject: [PATCH 13/28] Use GCC 8.1 for x86_64

---
 appveyor.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0edc7ce28..c8a5832c2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,7 +9,7 @@ environment:
  # c:\mingw-w64 i686 has gcc 6.3.0, so use c:\msys64 7.3.0 instead
  MINGW_SDK: c:\msys64\mingw32
  # c:\msys64 x86_64 has gcc 8.2.0, so use c:\mingw-w64 7.3.0 instead
- MINGW_SDK_64: C:\mingw-w64\x86_64-7.3.0-posix-seh-rt_v5-rev0\mingw64
+ MINGW_SDK_64: C:\mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64
  CFLAGS: -Wall -W -Werror -Wno-error=implicit-fallthrough -Wimplicit-fallthrough=3 -Wno-tautological-compare -Wno-error=suggest-attribute=noreturn
  NASM_ZIP: nasm-2.12.01
  NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip
@@ -92,8 +92,8 @@ before_build:
 - ccache -V
 - ccache -s
 - if [%NOUPX%] == [1] ( set "NOUPX=NOUPX=1" ) else ( set "NOUPX=" )
-- set "SRB2_MFLAGS=-C src WARNINGMODE=1 CCACHE=1 GCC73=1 NOOBJDUMP=1 %NOUPX%"
-- if [%X86_64%] == [1] ( set "MINGW_FLAGS=MINGW64=1 X86_64=1" ) else ( set "MINGW_FLAGS=MINGW=1 GCC91=1" )
+- set "SRB2_MFLAGS=-C src WARNINGMODE=1 CCACHE=1 NOOBJDUMP=1 %NOUPX%"
+- if [%X86_64%] == [1] ( set "MINGW_FLAGS=MINGW64=1 X86_64=1 GCC81=1" ) else ( set "MINGW_FLAGS=MINGW=1 GCC91=1" )
 - set "SRB2_MFLAGS=%SRB2_MFLAGS% %MINGW_FLAGS% %CONFIGURATION%=1"
 
 build_script:

From 1e42dc7ee519ba800354ff2d78d15bcaa8c23ec0 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Sat, 4 Jan 2020 11:08:05 +0100
Subject: [PATCH 14/28] Move P_ProcessLinedefsAfterSidedefs into P_LoadMapData,
 but move map data copying after everything else

---
 src/p_setup.c | 83 ++++++++++++++++++++++++++-------------------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/src/p_setup.c b/src/p_setup.c
index bd1c53104..a4e6707c0 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -1665,6 +1665,37 @@ static void P_LoadTextmap(void)
 	}
 }
 
+static void P_ProcessLinedefsAfterSidedefs(void)
+{
+	size_t i = numlines;
+	register line_t *ld = lines;
+	for (; i--; ld++)
+	{
+		ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here
+		ld->backsector = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0;
+
+		// Compile linedef 'text' from both sidedefs 'text' for appropriate specials.
+		switch (ld->special)
+		{
+		case 331: // Trigger linedef executor: Skin - Continuous
+		case 332: // Trigger linedef executor: Skin - Each time
+		case 333: // Trigger linedef executor: Skin - Once
+		case 443: // Calls a named Lua function
+			if (sides[ld->sidenum[0]].text)
+			{
+				size_t len = strlen(sides[ld->sidenum[0]].text) + 1;
+				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
+					len += strlen(sides[ld->sidenum[1]].text);
+				ld->text = Z_Malloc(len, PU_LEVEL, NULL);
+				M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text) + 1);
+				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
+					M_Memcpy(ld->text + strlen(ld->text) + 1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text) + 1);
+			}
+			break;
+		}
+	}
+}
+
 static boolean P_LoadMapData(const virtres_t *virt)
 {
 	virtlump_t *virtvertexes = NULL, *virtsectors = NULL, *virtsidedefs = NULL, *virtlinedefs = NULL, *virtthings = NULL;
@@ -1738,6 +1769,8 @@ static boolean P_LoadMapData(const virtres_t *virt)
 		P_LoadThings(virtthings->data);
 	}
 
+	P_ProcessLinedefsAfterSidedefs();
+
 	R_ClearTextureNumCache(true);
 
 	// set the sky flat num
@@ -1750,15 +1783,6 @@ static boolean P_LoadMapData(const virtres_t *virt)
 	// search for animated flats and set up
 	P_SetupLevelFlatAnims();
 
-	// Copy relevant map data for NetArchive purposes.
-	spawnsectors = Z_Calloc(numsectors * sizeof (*sectors), PU_LEVEL, NULL);
-	spawnlines = Z_Calloc(numlines * sizeof (*lines), PU_LEVEL, NULL);
-	spawnsides = Z_Calloc(numsides * sizeof (*sides), PU_LEVEL, NULL);
-
-	memcpy(spawnsectors, sectors, numsectors * sizeof (*sectors));
-	memcpy(spawnlines, lines, numlines * sizeof (*lines));
-	memcpy(spawnsides, sides, numsides * sizeof (*sides));
-
 	return true;
 }
 
@@ -2517,37 +2541,6 @@ static void P_LoadMapLUT(const virtres_t *virt)
 		P_CreateBlockMap();
 }
 
-static void P_ProcessLinedefsWithSidedefs(void)
-{
-	size_t i = numlines;
-	register line_t *ld = lines;
-	for (;i--;ld++)
-	{
-		ld->frontsector = sides[ld->sidenum[0]].sector; //e6y: Can't be -1 here
-		ld->backsector  = ld->sidenum[1] != 0xffff ? sides[ld->sidenum[1]].sector : 0;
-
-		// Compile linedef 'text' from both sidedefs 'text' for appropriate specials.
-		switch(ld->special)
-		{
-		case 331: // Trigger linedef executor: Skin - Continuous
-		case 332: // Trigger linedef executor: Skin - Each time
-		case 333: // Trigger linedef executor: Skin - Once
-		case 443: // Calls a named Lua function
-			if (sides[ld->sidenum[0]].text)
-			{
-				size_t len = strlen(sides[ld->sidenum[0]].text)+1;
-				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
-					len += strlen(sides[ld->sidenum[1]].text);
-				ld->text = Z_Malloc(len, PU_LEVEL, NULL);
-				M_Memcpy(ld->text, sides[ld->sidenum[0]].text, strlen(sides[ld->sidenum[0]].text)+1);
-				if (ld->sidenum[1] != 0xffff && sides[ld->sidenum[1]].text)
-					M_Memcpy(ld->text+strlen(ld->text)+1, sides[ld->sidenum[1]].text, strlen(sides[ld->sidenum[1]].text)+1);
-			}
-			break;
-		}
-	}
-}
-
 //
 // P_LinkMapData
 // Builds sector line lists and subsector sector numbers.
@@ -2713,9 +2706,17 @@ static boolean P_LoadMapFromFile(void)
 	P_LoadMapBSP(virt);
 	P_LoadMapLUT(virt);
 
-	P_ProcessLinedefsWithSidedefs();
 	P_LinkMapData();
 
+	// Copy relevant map data for NetArchive purposes.
+	spawnsectors = Z_Calloc(numsectors * sizeof(*sectors), PU_LEVEL, NULL);
+	spawnlines = Z_Calloc(numlines * sizeof(*lines), PU_LEVEL, NULL);
+	spawnsides = Z_Calloc(numsides * sizeof(*sides), PU_LEVEL, NULL);
+
+	memcpy(spawnsectors, sectors, numsectors * sizeof(*sectors));
+	memcpy(spawnlines, lines, numlines * sizeof(*lines));
+	memcpy(spawnsides, sides, numsides * sizeof(*sides));
+
 	P_MakeMapMD5(virt, &mapmd5);
 
 	vres_Free(virt);

From 49667689c1e43908c0f88bc120be13bd4f09539b Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Sat, 4 Jan 2020 11:17:54 +0100
Subject: [PATCH 15/28] Provide a fix for "non-sloped" slopes launch/land
 behavior by checking the normal's components.

---
 src/p_slopes.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/p_slopes.c b/src/p_slopes.c
index e66d7ed21..2cf2c74ba 100644
--- a/src/p_slopes.c
+++ b/src/p_slopes.c
@@ -50,10 +50,10 @@ static void ReconfigureViaVertexes (pslope_t *slope, const vector3_t v1, const v
 	// Set some defaults for a non-sloped "slope"
 	if (vec1.z == 0 && vec2.z == 0)
 	{
-		/// \todo Fix fully flat cases.
-
 		slope->zangle = slope->xydirection = 0;
 		slope->zdelta = slope->d.x = slope->d.y = 0;
+		slope->normal.x = slope->normal.y = 0;
+		slope->normal.z = FRACUNIT;
 	}
 	else
 	{
@@ -653,7 +653,9 @@ void P_ReverseQuantizeMomentumToSlope(vector3_t *momentum, pslope_t *slope)
 // Handles slope ejection for objects
 void P_SlopeLaunch(mobj_t *mo)
 {
-	if (!(mo->standingslope->flags & SL_NOPHYSICS)) // If there's physics, time for launching.
+	if (!(mo->standingslope->flags & SL_NOPHYSICS) // If there's physics, time for launching.
+		&& (mo->standingslope->normal.x != 0
+		||  mo->standingslope->normal.y != 0))
 	{
 		// Double the pre-rotation Z, then halve the post-rotation Z. This reduces the
 		// vertical launch given from slopes while increasing the horizontal launch
@@ -710,8 +712,7 @@ fixed_t P_GetWallTransferMomZ(mobj_t *mo, pslope_t *slope)
 void P_HandleSlopeLanding(mobj_t *thing, pslope_t *slope)
 {
 	vector3_t mom; // Ditto.
-
-	if (slope->flags & SL_NOPHYSICS) { // No physics, no need to make anything complicated.
+	if (slope->flags & SL_NOPHYSICS || (slope->normal.x == 0 && slope->normal.y == 0)) { // No physics, no need to make anything complicated.
 		if (P_MobjFlip(thing)*(thing->momz) < 0) // falling, land on slope
 		{
 			thing->standingslope = slope;

From 91222f75271aa6bf92362ba01b6993880c325e70 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Sat, 4 Jan 2020 18:05:03 +0100
Subject: [PATCH 16/28] Adapt P_ClosestPointOnLine3D() to be much like
 FV3_ClosestPointOnLine() and use vector3_t's as args, save for the hypotenuse
 calculation, which remains the same; the output should be the same as before.
 Adapt the rope hang snapping to the new function's form.

---
 src/p_maputl.c | 65 +++++++++++++-------------------------------------
 src/p_maputl.h |  2 +-
 src/p_spec.c   | 43 +++++++++++++++------------------
 3 files changed, 37 insertions(+), 73 deletions(-)

diff --git a/src/p_maputl.c b/src/p_maputl.c
index f598595e2..afa020504 100644
--- a/src/p_maputl.c
+++ b/src/p_maputl.c
@@ -78,68 +78,37 @@ void P_ClosestPointOnLine(fixed_t x, fixed_t y, line_t *line, vertex_t *result)
 	return;
 }
 
-//
-// P_ClosestPointOnLine3D
-// Finds the closest point on a given line to the supplied point IN 3D!!!
-//
-void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, vertex_t *result)
+/// Similar to FV3_ClosestPointOnLine() except it actually works.
+void P_ClosestPointOnLine3D(const vector3_t *p, const vector3_t *Line, vector3_t *result)
 {
-	fixed_t startx = line->v1->x;
-	fixed_t starty = line->v1->y;
-	fixed_t startz = line->v1->z;
-	fixed_t dx = line->dx;
-	fixed_t dy = line->dy;
-	fixed_t dz = line->v2->z - line->v1->z;
+	const vector3_t* v1 = &Line[0];
+	const vector3_t* v2 = &Line[1];
+	vector3_t c, V, n;
+	fixed_t t, d;
+	FV3_SubEx(v2, v1, &V);
+	FV3_SubEx(p, v1, &c);
 
-	// Determine t (the length of the vector from �Line[0]� to �p�)
-	fixed_t cx, cy, cz;
-	fixed_t vx, vy, vz;
-	fixed_t magnitude;
-	fixed_t t;
+	d = R_PointToDist2(0, v2->z, R_PointToDist2(v2->x, v2->y, v1->x, v1->y), v1->z);
+	FV3_Copy(&n, &V);
+	FV3_Divide(&n, d);
 
-	//Sub (p, &Line[0], &c);
-	cx = x - startx;
-	cy = y - starty;
-	cz = z - startz;
-
-	//Sub (&Line[1], &Line[0], &V);
-	vx = dx;
-	vy = dy;
-	vz = dz;
-
-	//Normalize (&V, &V);
-	magnitude = R_PointToDist2(0, line->v2->z, R_PointToDist2(line->v2->x, line->v2->y, startx, starty), startz);
-	vx = FixedDiv(vx, magnitude);
-	vy = FixedDiv(vy, magnitude);
-	vz = FixedDiv(vz, magnitude);
-
-	t = (FixedMul(vx, cx) + FixedMul(vy, cy) + FixedMul(vz, cz));
+	t = FV3_Dot(&n, &c);
 
 	// Set closest point to the end if it extends past -Red
 	if (t <= 0)
 	{
-		result->x = line->v1->x;
-		result->y = line->v1->y;
-		result->z = line->v1->z;
+		FV3_Copy(result, v1);
 		return;
 	}
-	else if (t >= magnitude)
+	else if (t >= d)
 	{
-		result->x = line->v2->x;
-		result->y = line->v2->y;
-		result->z = line->v2->z;
+		FV3_Copy(result, v2);
 		return;
 	}
 
-	// Return the point between �Line[0]� and �Line[1]�
-	vx = FixedMul(vx, t);
-	vy = FixedMul(vy, t);
-	vz = FixedMul(vz, t);
+	FV3_Mul(&n, t);
 
-	//Add (&Line[0], &V, out);
-	result->x = startx + vx;
-	result->y = starty + vy;
-	result->z = startz + vz;
+	FV3_AddEx(v1, &n, result);
 	return;
 }
 
diff --git a/src/p_maputl.h b/src/p_maputl.h
index 2ca718779..16cfc834e 100644
--- a/src/p_maputl.h
+++ b/src/p_maputl.h
@@ -43,7 +43,7 @@ boolean P_PathTraverse(fixed_t px1, fixed_t py1, fixed_t px2, fixed_t py2,
 
 FUNCMATH fixed_t P_AproxDistance(fixed_t dx, fixed_t dy);
 void P_ClosestPointOnLine(fixed_t x, fixed_t y, line_t *line, vertex_t *result);
-void P_ClosestPointOnLine3D(fixed_t x, fixed_t y, fixed_t z, line_t *line, vertex_t *result);
+void P_ClosestPointOnLine3D(const vector3_t *p, const vector3_t *line, vector3_t *result);
 INT32 P_PointOnLineSide(fixed_t x, fixed_t y, line_t *line);
 void P_MakeDivline(line_t *li, divline_t *dl);
 void P_CameraLineOpening(line_t *plinedef);
diff --git a/src/p_spec.c b/src/p_spec.c
index a97d1f92f..00a71602b 100644
--- a/src/p_spec.c
+++ b/src/p_spec.c
@@ -5038,8 +5038,7 @@ DoneSection2:
 				mobj_t *waypointlow = NULL;
 				mobj_t *mo2;
 				mobj_t *closest = NULL;
-				line_t junk;
-				vertex_t v1, v2, resulthigh, resultlow;
+				vector3_t p, line[2], resulthigh, resultlow;
 				mobj_t *highest = NULL;
 
 				if (player->mo->tracer && player->mo->tracer->type == MT_TUBEWAYPOINT && player->powers[pw_carry] == CR_ROPEHANG)
@@ -5186,38 +5185,34 @@ DoneSection2:
 				// Next, we need to find the closest point on the line between each set, and determine which one we're
 				// closest to.
 
+				p.x = player->mo->x;
+				p.y = player->mo->y;
+				p.z = player->mo->z;
+
 				// Waypointmid and Waypointlow:
 				if (waypointlow)
 				{
-					v1.x = waypointmid->x;
-					v1.y = waypointmid->y;
-					v1.z = waypointmid->z;
-					v2.x = waypointlow->x;
-					v2.y = waypointlow->y;
-					v2.z = waypointlow->z;
-					junk.v1 = &v1;
-					junk.v2 = &v2;
-					junk.dx = v2.x - v1.x;
-					junk.dy = v2.y - v1.y;
+					line[0].x = waypointmid->x;
+					line[0].y = waypointmid->y;
+					line[0].z = waypointmid->z;
+					line[1].x = waypointlow->x;
+					line[1].y = waypointlow->y;
+					line[1].z = waypointlow->z;
 
-					P_ClosestPointOnLine3D(player->mo->x, player->mo->y, player->mo->z, &junk, &resultlow);
+					P_ClosestPointOnLine3D(&p, line, &resultlow);
 				}
 
 				// Waypointmid and Waypointhigh:
 				if (waypointhigh)
 				{
-					v1.x = waypointmid->x;
-					v1.y = waypointmid->y;
-					v1.z = waypointmid->z;
-					v2.x = waypointhigh->x;
-					v2.y = waypointhigh->y;
-					v2.z = waypointhigh->z;
-					junk.v1 = &v1;
-					junk.v2 = &v2;
-					junk.dx = v2.x - v1.x;
-					junk.dy = v2.y - v1.y;
+					line[0].x = waypointmid->x;
+					line[0].y = waypointmid->y;
+					line[0].z = waypointmid->z;
+					line[1].x = waypointhigh->x;
+					line[1].y = waypointhigh->y;
+					line[1].z = waypointhigh->z;
 
-					P_ClosestPointOnLine3D(player->mo->x, player->mo->y, player->mo->z, &junk, &resulthigh);
+					P_ClosestPointOnLine3D(&p, line, &resulthigh);
 				}
 
 				// 3D support now available. Disregard the previous notice here. -Red

From 9999be2d6e14fd605d55ac3fe4f28c088e497880 Mon Sep 17 00:00:00 2001
From: Nev3r <apophycens@gmail.com>
Date: Sat, 4 Jan 2020 18:29:02 +0100
Subject: [PATCH 17/28] Remove vertex_t's z variable.

---
 src/lua_maplib.c | 7 +------
 src/p_setup.c    | 2 --
 src/r_defs.h     | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index 8ce6551f7..309ba86a1 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -157,15 +157,13 @@ static const char *const side_opt[] = {
 enum vertex_e {
 	vertex_valid = 0,
 	vertex_x,
-	vertex_y,
-	vertex_z
+	vertex_y
 };
 
 static const char *const vertex_opt[] = {
 	"valid",
 	"x",
 	"y",
-	"z",
 	NULL};
 
 enum ffloor_e {
@@ -970,9 +968,6 @@ static int vertex_get(lua_State *L)
 	case vertex_y:
 		lua_pushfixed(L, vertex->y);
 		return 1;
-	case vertex_z:
-		lua_pushfixed(L, vertex->z);
-		return 1;
 	}
 	return 0;
 }
diff --git a/src/p_setup.c b/src/p_setup.c
index bd1c53104..fa60fcf6d 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -846,7 +846,6 @@ static void P_LoadVertices(UINT8 *data)
 	{
 		v->x = SHORT(mv->x)<<FRACBITS;
 		v->y = SHORT(mv->y)<<FRACBITS;
-		v->z = 0;
 	}
 }
 
@@ -1575,7 +1574,6 @@ static void P_LoadTextmap(void)
 	{
 		// Defaults.
 		vt->x = vt->y = INT32_MAX;
-		vt->z = 0;
 
 		TextmapParse(vertexesPos[i], i, ParseTextmapVertexParameter);
 
diff --git a/src/r_defs.h b/src/r_defs.h
index 96ef953ce..c7c198d66 100644
--- a/src/r_defs.h
+++ b/src/r_defs.h
@@ -83,7 +83,7 @@ typedef struct extracolormap_s
   */
 typedef struct
 {
-	fixed_t x, y, z;
+	fixed_t x, y;
 } vertex_t;
 
 // Forward of linedefs, for sectors.

From deee2a0d6fae77ed8cd1a17669fb6384ecde2119 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Sat, 4 Jan 2020 22:19:30 -0300
Subject: [PATCH 18/28] I was using V_GetColor in a lot of places I shouldn't
 have, making the game look wrong with a non-default colour profile. Though, I
 left R_RainbowColormap alone.

---
 src/r_data.c  | 6 +++---
 src/v_video.h | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/r_data.c b/src/r_data.c
index bfd83a62d..986b65dea 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -324,8 +324,8 @@ UINT8 ASTBlendPixel_8bpp(UINT8 background, UINT8 foreground, int style, UINT8 al
 	else if (style != AST_TRANSLUCENT)
 	{
 		RGBA_t texel;
-		RGBA_t bg = V_GetColor(background);
-		RGBA_t fg = V_GetColor(foreground);
+		RGBA_t bg = V_GetMasterColor(background);
+		RGBA_t fg = V_GetMasterColor(foreground);
 		texel.rgba = ASTBlendPixel(bg, fg, style, alpha);
 		return NearestColor(texel.s.red, texel.s.green, texel.s.blue);
 	}
@@ -1664,7 +1664,7 @@ static void R_CreateFadeColormaps(void)
 #define GETCOLOR \
 	px = colormaps[i%256]; \
 	fade = (i/256) * (256 / FADECOLORMAPROWS); \
-	rgba = V_GetColor(px);
+	rgba = V_GetMasterColor(px);
 
 	// to black
 	makeblack:
diff --git a/src/v_video.h b/src/v_video.h
index 36d1914af..eb75a414f 100644
--- a/src/v_video.h
+++ b/src/v_video.h
@@ -64,6 +64,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
 
 // Retrieve the ARGB value from a palette color index
 #define V_GetColor(color) (pLocalPalette[color&0xFF])
+#define V_GetMasterColor(color) (pMasterPalette[color&0xFF])
 
 // Bottom 8 bits are used for parameter (screen or character)
 #define V_PARAMMASK          0x000000FF

From 6c85c4e1d39f6d686d19595539f6b349d01df887 Mon Sep 17 00:00:00 2001
From: Louis-Antoine <lamr@free.fr>
Date: Sun, 5 Jan 2020 18:39:16 +0100
Subject: [PATCH 19/28] Fix mouse being grabbed even when not used

---
 src/sdl/i_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index e6a40327b..785d8c4dc 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -110,7 +110,7 @@ static SDL_bool disable_fullscreen = SDL_FALSE;
 #define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value
 static SDL_bool disable_mouse = SDL_FALSE;
 #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus)
-#define IGNORE_MOUSE (!cv_alwaysgrabmouse.value && (menuactive || paused || con_destlines || chat_on || gamestate != GS_LEVEL))
+#define IGNORE_MOUSE (!USE_MOUSEINPUT || (!cv_alwaysgrabmouse.value && (menuactive || paused || con_destlines || chat_on || gamestate != GS_LEVEL)))
 #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN)
 #define MOUSEBUTTONS_MAX MOUSEBUTTONS
 

From 88c8049c77f3c38768de19c02394f5b888028f96 Mon Sep 17 00:00:00 2001
From: Louis-Antoine <lamr@free.fr>
Date: Sun, 5 Jan 2020 18:39:16 +0100
Subject: [PATCH 20/28] Revert "Fix mouse being grabbed even when not used"

This reverts commit 6c85c4e1d39f6d686d19595539f6b349d01df887.
---
 src/sdl/i_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 785d8c4dc..e6a40327b 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -110,7 +110,7 @@ static SDL_bool disable_fullscreen = SDL_FALSE;
 #define USE_FULLSCREEN (disable_fullscreen||!allow_fullscreen)?0:cv_fullscreen.value
 static SDL_bool disable_mouse = SDL_FALSE;
 #define USE_MOUSEINPUT (!disable_mouse && cv_usemouse.value && havefocus)
-#define IGNORE_MOUSE (!USE_MOUSEINPUT || (!cv_alwaysgrabmouse.value && (menuactive || paused || con_destlines || chat_on || gamestate != GS_LEVEL)))
+#define IGNORE_MOUSE (!cv_alwaysgrabmouse.value && (menuactive || paused || con_destlines || chat_on || gamestate != GS_LEVEL))
 #define MOUSE_MENU false //(!disable_mouse && cv_usemouse.value && menuactive && !USE_FULLSCREEN)
 #define MOUSEBUTTONS_MAX MOUSEBUTTONS
 

From e847777a35eab5a5c3e05bd189b6f308457ca5db Mon Sep 17 00:00:00 2001
From: Louis-Antoine <lamr@free.fr>
Date: Sun, 5 Jan 2020 18:39:16 +0100
Subject: [PATCH 21/28] Fix mouse being grabbed even when not used

The other way around this time.
---
 src/sdl/i_video.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index e6a40327b..2b8633e5b 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -388,7 +388,7 @@ void I_UpdateMouseGrab(void)
 {
 	if (SDL_WasInit(SDL_INIT_VIDEO) == SDL_INIT_VIDEO && window != NULL
 	&& SDL_GetMouseFocus() == window && SDL_GetKeyboardFocus() == window
-	&& !IGNORE_MOUSE)
+	&& USE_MOUSEINPUT && !IGNORE_MOUSE)
 		SDLdoGrabMouse();
 }
 

From 664bce71deae6135cbb58c840ba2293a61ab7ea7 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 5 Jan 2020 23:18:38 -0300
Subject: [PATCH 22/28] :amybruh:

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

diff --git a/src/p_mobj.c b/src/p_mobj.c
index e8461957f..713a4d476 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7977,15 +7977,18 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 		mobj->x = mobj->extravalue1 + P_ReturnThrustX(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
 		mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
 		P_SetThingPosition(mobj);
-		if ((--mobj->fuse) < 6)
-		{
-			if (!mobj->fuse)
+		
+		// :amybruh:
+		if (!mobj->fuse)
 			{
-				P_RemoveMobj(mobj);
+#ifdef HAVE_BLUA
+				if (!LUAh_MobjFuse(mobj))
+#endif
+					P_RemoveMobj(mobj);
 				return;
 			}
+		if ((--mobj->fuse) < 6)
 			mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
-		}
 	}
 	break;
 	case MT_VWREF:

From fce1313517658f86b7865d823a2e42af6dbba919 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 5 Jan 2020 23:19:52 -0300
Subject: [PATCH 23/28] No comments

---
 src/p_mobj.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 713a4d476..05a535175 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7978,7 +7978,6 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 		mobj->y = mobj->extravalue2 + P_ReturnThrustY(mobj, mobj->movedir, mobj->cvmem*mobj->scale);
 		P_SetThingPosition(mobj);
 		
-		// :amybruh:
 		if (!mobj->fuse)
 			{
 #ifdef HAVE_BLUA

From 07f9ddc45a169e3ab23aa528428482df58f142b6 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Sun, 5 Jan 2020 23:41:22 -0300
Subject: [PATCH 24/28] Don't fuck with the fuse if it's negative

---
 src/p_mobj.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index 05a535175..fbfbaab00 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7986,6 +7986,8 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 					P_RemoveMobj(mobj);
 				return;
 			}
+		if (mobj->fuse < 0)
+			return;
 		if ((--mobj->fuse) < 6)
 			mobj->frame = (mobj->frame & ~FF_TRANSMASK) | ((10 - (mobj->fuse*2)) << (FF_TRANSSHIFT));
 	}

From 0fbc459243323a4de96faaffb1c9ff7e2e7a4ee9 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Sun, 5 Jan 2020 21:49:07 -0500
Subject: [PATCH 25/28] cleanup whitespace

---
 src/m_menu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/m_menu.c b/src/m_menu.c
index e9d794bd1..ea2c5c6d8 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -10524,7 +10524,7 @@ static void M_HandleConnectIP(INT32 choice)
 					case 'V': // ctrl+v, pasting
 					{
 						const char *paste = I_ClipboardPaste();
-						
+
 						if (paste != NULL) {
 							strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
 							if (strlen(paste) != 0) // Don't play sound if nothing was pasted
@@ -10558,7 +10558,7 @@ static void M_HandleConnectIP(INT32 choice)
 					case KEY_INS: // shift+insert, pasting
 						{
 							const char *paste = I_ClipboardPaste();
-							
+
 							if (paste != NULL) {
 								strncat(setupm_ip, paste, 28-1 - l); // Concat the ip field with clipboard
 								if (strlen(paste) != 0) // Don't play sound if nothing was pasted

From 759b1c82e28325530deec9c4720b31ca33965c96 Mon Sep 17 00:00:00 2001
From: MascaraSnake <jonassauer27@gmail.com>
Date: Mon, 6 Jan 2020 14:40:59 +0100
Subject: [PATCH 26/28] Add missing glseg checks (and remove a superfluous one)

---
 src/hardware/hw_bsp.c  |  6 +++++-
 src/hardware/hw_main.c |  7 ++++---
 src/p_sight.c          |  3 +++
 src/r_main.c           | 12 +++++++++---
 src/r_segs.c           |  3 ---
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/hardware/hw_bsp.c b/src/hardware/hw_bsp.c
index f8d4f43d9..6f3dd9fbd 100644
--- a/src/hardware/hw_bsp.c
+++ b/src/hardware/hw_bsp.c
@@ -449,8 +449,12 @@ static poly_t *CutOutSubsecPoly(seg_t *lseg, INT32 count, poly_t *poly)
 	// for each seg of the subsector
 	for (; count--; lseg++)
 	{
-		//x,y,dx,dy (like a divline)
 		line_t *line = lseg->linedef;
+
+		if (lseg->glseg)
+			continue;
+
+		//x,y,dx,dy (like a divline)
 		p1.x = FIXED_TO_FLOAT(lseg->side ? line->v2->x : line->v1->x);
 		p1.y = FIXED_TO_FLOAT(lseg->side ? line->v2->y : line->v1->y);
 		p2.x = FIXED_TO_FLOAT(lseg->side ? line->v1->x : line->v2->x);
diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 276a66670..8c36eeded 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -2714,8 +2714,6 @@ static void HWR_AddLine(seg_t * line)
 	static sector_t tempsec;
 
 	fixed_t v1x, v1y, v2x, v2y; // the seg's vertexes as fixed_t
-	if (line->glseg)
-		return;
 #ifdef POLYOBJECTS
 	if (line->polyseg && !(line->polyseg->flags & POF_RENDERSIDES))
 		return;
@@ -3773,9 +3771,12 @@ static void HWR_Subsector(size_t num)
 
 		while (count--)
 		{
+
+			if (!line->glseg
 #ifdef POLYOBJECTS
-				if (!line->polyseg) // ignore segs that belong to polyobjects
+				&& !line->polyseg // ignore segs that belong to polyobjects
 #endif
+				)
 				HWR_AddLine(line);
 				line++;
 		}
diff --git a/src/p_sight.c b/src/p_sight.c
index 499d4a095..07dfabbc1 100644
--- a/src/p_sight.c
+++ b/src/p_sight.c
@@ -222,6 +222,9 @@ static boolean P_CrossSubsector(size_t num, register los_t *los)
 		fixed_t fracx, fracy;
 #endif
 
+		if (seg->glseg)
+			continue;
+
 		// already checked other side?
 		if (line->validcount == validcount)
 			continue;
diff --git a/src/r_main.c b/src/r_main.c
index a5f4bc118..22061b407 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -698,6 +698,7 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
 	INT32 side, i;
 	size_t nodenum;
 	subsector_t *ret;
+	seg_t *seg;
 
 	// single subsector is a special case
 	if (numnodes == 0)
@@ -713,10 +714,15 @@ subsector_t *R_IsPointInSubsector(fixed_t x, fixed_t y)
 	}
 
 	ret = &subsectors[nodenum & ~NF_SUBSECTOR];
-	for (i = 0; i < ret->numlines; i++)
-		//if (R_PointOnSegSide(x, y, &segs[ret->firstline + i])) -- breaks in ogl because polyvertex_t cast over vertex pointers
-		if (P_PointOnLineSide(x, y, segs[ret->firstline + i].linedef) != segs[ret->firstline + i].side)
+	for (i = 0, seg = &segs[ret->firstline]; i < ret->numlines; i++, seg++)
+	{
+		if (seg->glseg)
+			continue;
+
+		//if (R_PointOnSegSide(x, y, seg)) -- breaks in ogl because polyvertex_t cast over vertex pointers
+		if (P_PointOnLineSide(x, y, seg->linedef) != seg->side)
 			return 0;
+	}
 
 	return ret;
 }
diff --git a/src/r_segs.c b/src/r_segs.c
index 1af1cb2a2..dcb5fc160 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -309,9 +309,6 @@ void R_RenderMaskedSegRange(drawseg_t *ds, INT32 x1, INT32 x2)
 	// OPTIMIZE: get rid of LIGHTSEGSHIFT globally
 	curline = ds->curline;
 
-	if (curline->glseg)
-		return;
-
 	frontsector = curline->frontsector;
 	backsector = curline->backsector;
 	texnum = R_GetTextureNum(curline->sidedef->midtexture);

From 21c224fce0a2a72f5a6be2477fe6a892120161fe Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Mon, 6 Jan 2020 09:58:05 -0500
Subject: [PATCH 27/28] idented hell

---
 src/hardware/hw_main.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/hardware/hw_main.c b/src/hardware/hw_main.c
index 8c36eeded..2f986085a 100644
--- a/src/hardware/hw_main.c
+++ b/src/hardware/hw_main.c
@@ -3774,11 +3774,13 @@ static void HWR_Subsector(size_t num)
 
 			if (!line->glseg
 #ifdef POLYOBJECTS
-				&& !line->polyseg // ignore segs that belong to polyobjects
+			    && !line->polyseg // ignore segs that belong to polyobjects
 #endif
-				)
+			)
+			{
 				HWR_AddLine(line);
-				line++;
+			}
+			line++;
 		}
 	}
 

From 360e8f28b4da34062eaf1845855070af8c3e4492 Mon Sep 17 00:00:00 2001
From: Tatsuru <44866610+Ikkarin@users.noreply.github.com>
Date: Tue, 7 Jan 2020 01:24:04 -0300
Subject: [PATCH 28/28] ifdefs make indenting confusing

---
 src/p_mobj.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/p_mobj.c b/src/p_mobj.c
index fbfbaab00..3d8d81d9b 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -7979,13 +7979,13 @@ static void P_MobjSceneryThink(mobj_t *mobj)
 		P_SetThingPosition(mobj);
 		
 		if (!mobj->fuse)
-			{
+		{
 #ifdef HAVE_BLUA
-				if (!LUAh_MobjFuse(mobj))
+			if (!LUAh_MobjFuse(mobj))
 #endif
-					P_RemoveMobj(mobj);
-				return;
-			}
+				P_RemoveMobj(mobj);
+			return;
+		}
 		if (mobj->fuse < 0)
 			return;
 		if ((--mobj->fuse) < 6)