From cc3886888a187c83618c0cad28431976de01ee91 Mon Sep 17 00:00:00 2001
From: TartanSpartan <seumasfinlauyson@googlemail.com>
Date: Thu, 12 Feb 2026 00:18:36 +0000
Subject: [PATCH] Suppress gadget notifications in cutscenes

---
 src/game/propobj.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/game/propobj.c b/src/game/propobj.c
index 9c6c8d864..0d1b3f253 100644
--- a/src/game/propobj.c
+++ b/src/game/propobj.c
@@ -17201,6 +17201,12 @@ void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual)
 {
 	char buffer[100] = "";
 
+	// Suppress pickup HUD during cutscenes
+	if (g_Vars.in_cutscene)
+	{
+		return;
+	}
+
 	weaponGetPickupText(buffer, weaponnum, dual);
 	hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
 }
@@ -17217,6 +17223,13 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg)
 		return TICKOP_NONE;
 	}
 
+	// Suppress HUD pickup messages during cutscenes (e.g. items given at
+	// mission start via aiGiveObjectToChr)
+	if (g_Vars.in_cutscene)
+	{
+		showhudmsg = false;
+	}
+
 	switch (obj->type) {
 	case OBJTYPE_KEY:
 		if (g_Vars.in_cutscene == false) {