From 5c6d4e5134ef607af4fbfb8d18682566da0b4571 Mon Sep 17 00:00:00 2001 From: Julie Marchant Date: Sun, 26 May 2019 20:18:10 -0400 Subject: [PATCH] Restored use of the word "Target" for all target life bars in Classic mode. At some point I replaced the "Target" text with "Sid", "Phoebe", and "Kline" for those respective characters. Classic difficulty now always uses the word "Target" once again. --- README.txt | 3 --- src/game.c | 21 ++++++++++++++------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.txt b/README.txt index b25468d..500dd18 100644 --- a/README.txt +++ b/README.txt @@ -54,9 +54,6 @@ as possible. However, there are several minor differences in addition to the changes to graphics, sound, and dialog. Here you can fine a list of notable differences. -* Life bars for named characters are labeled with the respective - character's name instead of "Target". - * Selling your secondary weapon leaves you with standard Rockets. In version 1.1, it instead left you with no secondary weapon at all (with no way to gain standard Rockets back). diff --git a/src/game.c b/src/game.c index a6334cf..7301001 100644 --- a/src/game.c +++ b/src/game.c @@ -1997,14 +1997,21 @@ static void game_doHud() if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) && (engine.targetIndex > engine.maxAliens)) { - if (engine.targetIndex == ALIEN_SID) - screen_blitText(TS_TARGET_SID); - else if (engine.targetIndex == ALIEN_PHOEBE) - screen_blitText(TS_TARGET_PHOEBE); - else if (engine.targetIndex == ALIEN_KLINE) - screen_blitText(TS_TARGET_KLINE); - else + if (game.difficulty == DIFFICULTY_ORIGINAL) + { screen_blitText(TS_TARGET); + } + else + { + if (engine.targetIndex == ALIEN_SID) + screen_blitText(TS_TARGET_SID); + else if (engine.targetIndex == ALIEN_PHOEBE) + screen_blitText(TS_TARGET_PHOEBE); + else if (engine.targetIndex == ALIEN_KLINE) + screen_blitText(TS_TARGET_KLINE); + else + screen_blitText(TS_TARGET); + } bar.w = MAX(screen->w / 800, 1); bar.h = 12;