From 6632f5c4c675998093c62f7786d98db6047fad60 Mon Sep 17 00:00:00 2001 From: James R Date: Tue, 2 Apr 2024 03:44:50 -0700 Subject: [PATCH] HUD tracking: simplify Bubble Shield, Garden Top conditions Should be equivalent yet with far less code. --- src/k_hud_track.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/k_hud_track.cpp b/src/k_hud_track.cpp index 7c7845043..54b12c0b9 100644 --- a/src/k_hud_track.cpp +++ b/src/k_hud_track.cpp @@ -383,18 +383,13 @@ std::optional object_tooltip(const mobj_t* mobj) case MT_BUBBLESHIELDTRAP: return conditional( - mobj->tracer && !P_MobjWasRemoved(mobj->tracer) - && mobj->tracer->player && P_IsDisplayPlayer(mobj->tracer->player) - && mobj->tracer->player == &players[displayplayers[R_GetViewNumber()]], + mobj->tracer == stplyr->mo, [&] { return TextElement(((leveltime / 3) % 2) ? "\xB3 " : " \xB2").font(Draw::Font::kMenu); } ); case MT_GARDENTOP: return conditional( - mobj->tracer && !P_MobjWasRemoved(mobj->tracer) - && mobj->tracer->player && P_IsDisplayPlayer(mobj->tracer->player) - && mobj->tracer->player == &players[displayplayers[R_GetViewNumber()]] - && Obj_GardenTopPlayerNeedsHelp(mobj), + mobj->tracer == stplyr->mo && Obj_GardenTopPlayerNeedsHelp(mobj), [&] { return TextElement("Try \xA7!").font(splitfont); } );