Suppress gadget notifications in cutscenes

This commit is contained in:
TartanSpartan committed 2026-02-12 00:18:36 +00:00
1 parent 55ca51d8cc
commit cc3886888a
1 file changed
+13
+13
View File
@@ -17201,6 +17201,12 @@ void currentPlayerQueuePickupWeaponHudmsg(u32 weaponnum, bool dual)
{ {
char buffer[100] = ""; char buffer[100] = "";
// Suppress pickup HUD during cutscenes
if (g_Vars.in_cutscene)
{
return;
}
weaponGetPickupText(buffer, weaponnum, dual); weaponGetPickupText(buffer, weaponnum, dual);
hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES); hudmsgCreateWithFlags(buffer, HUDMSGTYPE_DEFAULT, HUDMSGFLAG_ONLYIFALIVE | HUDMSGFLAG_ALLOWDUPES);
} }
@@ -17217,6 +17223,13 @@ s32 propPickupByPlayer(struct prop *prop, bool showhudmsg)
return TICKOP_NONE; 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) { switch (obj->type) {
case OBJTYPE_KEY: case OBJTYPE_KEY:
if (g_Vars.in_cutscene == false) { if (g_Vars.in_cutscene == false) {