From 5921d17cc044a430fc998bd88d1f056b48a426cd Mon Sep 17 00:00:00 2001
From: Zachary McAlpin <choalover@gmail.com>
Date: Sat, 14 Dec 2019 15:28:24 -0600
Subject: [PATCH] Added PlayerThink hook

---
 src/lua_hook.h    |  2 ++
 src/lua_hooklib.c |  2 ++
 src/p_user.c      | 20 +++++++++++++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/lua_hook.h b/src/lua_hook.h
index bd2afebb..3f2dfd7a 100644
--- a/src/lua_hook.h
+++ b/src/lua_hook.h
@@ -46,6 +46,7 @@ enum hook {
 	hook_HurtMsg,
 	hook_PlayerSpawn,
 	hook_PlayerQuit,
+	hook_PlayerThink,
 	hook_MusicChange,
 	hook_ShouldSpin,	//SRB2KART
 	hook_ShouldExplode,	//SRB2KART
@@ -110,5 +111,6 @@ boolean LUAh_PlayerCmd(player_t *player, ticcmd_t *cmd);	// Allows to write to p
 
 void LUAh_IntermissionThinker(void); // Hook for Y_Ticker
 void LUAh_VoteThinker(void);	// Hook for Y_VoteTicker
+#define LUAh_PlayerThink(player) LUAh_PlayerHook(player, hook_PlayerThink) // Hook for P_PlayerThink
 
 #endif
diff --git a/src/lua_hooklib.c b/src/lua_hooklib.c
index 90a13c6f..e9a4d0b4 100644
--- a/src/lua_hooklib.c
+++ b/src/lua_hooklib.c
@@ -57,6 +57,7 @@ const char *const hookNames[hook_MAX+1] = {
 	"HurtMsg",
 	"PlayerSpawn",
 	"PlayerQuit",
+	"PlayerThink",
 	"MusicChange",
 	"ShouldSpin",
 	"ShouldExplode",
@@ -208,6 +209,7 @@ static int lib_addHook(lua_State *L)
 	case hook_SpinSpecial:
 	case hook_JumpSpinSpecial:
 	case hook_PlayerSpawn:
+	case hook_PlayerThink:
 		lastp = &playerhooks;
 		break;
 	case hook_LinedefExecute:
diff --git a/src/p_user.c b/src/p_user.c
index cb6b7bd6..dc22bd94 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -8244,7 +8244,12 @@ void P_PlayerThink(player_t *player)
 				player->playerstate = PST_REBORN;
 		}
 		if (player->playerstate == PST_REBORN)
+		{
+#ifdef HAVE_BLUA
+			LUAh_PlayerThink(player);
+#endif
 			return;
+		}
 	}
 
 #ifdef SEENAMES
@@ -8368,7 +8373,12 @@ void P_PlayerThink(player_t *player)
 				P_DoTimeOver(player);
 
 				if (player->playerstate == PST_DEAD)
+				{
+#ifdef HAVE_BLUA
+					LUAh_PlayerThink(player);
+#endif
 					return;
+				}
 			}
 		}
 
@@ -8432,7 +8442,9 @@ void P_PlayerThink(player_t *player)
 		else
 			player->mo->flags2 &= ~MF2_SHADOW;
 		P_DeathThink(player);
-
+#ifdef HAVE_BLUA
+		LUAh_PlayerThink(player);
+#endif
 		return;
 	}
 
@@ -8566,6 +8578,12 @@ void P_PlayerThink(player_t *player)
 	}
 	else
 		P_MovePlayer(player);
+	}
+
+#ifdef HAVE_BLUA
+	LUAh_PlayerThink(player);
+#endif
+
 
 	if (!player->mo)
 		return; // P_MovePlayer removed player->mo.