From 55ca51d8cc99b5855ca7233d77d0a84bd81516a0 Mon Sep 17 00:00:00 2001 From: TartanSpartan Date: Fri, 30 Jan 2026 20:46:08 +0000 Subject: [PATCH 1/2] Have HUD acknowledge new weapons gifted from NPCs --- src/game/chraicommands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c index 805fd739c..7fd81d305 100644 --- a/src/game/chraicommands.c +++ b/src/game/chraicommands.c @@ -2330,7 +2330,7 @@ bool aiGiveObjectToChr(void) } #endif - something = propPickupByPlayer(obj->prop, 0); + something = propPickupByPlayer(obj->prop, 1); propExecuteTickOperation(obj->prop, something); playernum = playermgrGetPlayerNumByProp(chr->prop); obj2->hidden = (playernum << 28) | (obj2->hidden & 0x0fffffff); From cc3886888a187c83618c0cad28431976de01ee91 Mon Sep 17 00:00:00 2001 From: TartanSpartan Date: Thu, 12 Feb 2026 00:18:36 +0000 Subject: [PATCH 2/2] 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) {