From f8e23ab061e14b6f427709a6a6e9ff649b3416c7 Mon Sep 17 00:00:00 2001 From: onpon4 Date: Fri, 8 Jan 2016 10:52:34 -0500 Subject: [PATCH] Added special target text when Sid or Phoebe is the target. This is because it may not be obvious that Sid or Phoebe is the target now that the indicator for them says their names. --- src/defs.h | 2 ++ src/game.cpp | 11 +++++++++-- src/missions.cpp | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/defs.h b/src/defs.h index 90a748a..3deea94 100644 --- a/src/defs.h +++ b/src/defs.h @@ -558,6 +558,8 @@ enum { TS_PLASMA_T, TS_AMMO_T, TS_TARGET, + TS_TARGET_SID, + TS_TARGET_PHOEBE, TS_CASH_T, TS_OBJECTIVES_T, TS_TIME_T, diff --git a/src/game.cpp b/src/game.cpp index 3410f36..72f8027 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1828,9 +1828,16 @@ static void game_doHud() // Do the target's remaining shield (if required) if (game.area != MISN_DORIM) { - if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) && (engine.targetIndex > 9)) + if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) && + (engine.targetIndex > engine.maxAliens)) { - screen_blitText(TS_TARGET); + if (engine.targetIndex == ALIEN_SID) + screen_blitText(TS_TARGET_SID); + else if (engine.targetIndex == ALIEN_PHOEBE) + screen_blitText(TS_TARGET_PHOEBE); + else + screen_blitText(TS_TARGET); + bar.w = MAX(screen->w / 800, 1); bar.h = 12; bar.x = screen->w * 11 / 16 + 65; diff --git a/src/missions.cpp b/src/missions.cpp index 1efc635..6eaefeb 100644 --- a/src/missions.cpp +++ b/src/missions.cpp @@ -804,6 +804,8 @@ void missionBriefScreen() gfx_createTextObject(TS_AMMO_T, "Rockets:", screen->w / 2, screen->h - 50, FONT_WHITE); gfx_createTextObject(TS_TARGET, "Target", screen->w * 11 / 16, screen->h - 50, FONT_WHITE); + gfx_createTextObject(TS_TARGET_SID, "Sid", screen->w * 11 / 16 + 27, screen->h - 50, FONT_WHITE); + gfx_createTextObject(TS_TARGET_PHOEBE, "Phoebe", screen->w * 11 / 16, screen->h - 50, FONT_WHITE); gfx_createTextObject(TS_CASH_T, "Cash: $", 25, 20, FONT_WHITE); gfx_createTextObject(TS_OBJECTIVES_T, "Objectives Remaining:", screen->w - 250, 20, FONT_WHITE); gfx_createTextObject(TS_TIME_T, "Time Remaining - ", screen->w / 2 - 140, 20, FONT_WHITE);