walkero
/
starfighter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Adapt HUD during missions" 

This reverts commit 9d825e5415.
This commit is contained in:
Julie Marchant 2019-05-30 18:02:18 -04:00
parent 9d825e5415
commit dabda7f436
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game.c
View File

@ -1820,14 +1820,13 @@ static void game_doHud()
if (engine.minutes > -1) if (engine.minutes > -1)
{ {
gfx_createTextObject(TS_TIME_T, "Time Remaining - ", screen->w / 2 - 140, 20, FONT_WHITE);
screen_blitText(TS_TIME_T);
if ((engine.minutes == 0) && (engine.seconds <= 29)) if ((engine.minutes == 0) && (engine.seconds <= 29))
fontColor = FONT_RED; fontColor = FONT_RED;
else if ((engine.minutes == 0) && (engine.seconds > 29)) else if ((engine.minutes == 0) && (engine.seconds > 29))
fontColor = FONT_YELLOW; fontColor = FONT_YELLOW;
else else
fontColor = FONT_WHITE; fontColor = FONT_WHITE;
screen_blitText(TS_TIME_T);
sprintf(text, "%.2d:%.2d", engine.minutes, engine.seconds); sprintf(text, "%.2d:%.2d", engine.minutes, engine.seconds);
gfx_createTextObject(TS_TIME, text, screen->w / 2 + 10, 21, fontColor); gfx_createTextObject(TS_TIME, text, screen->w / 2 + 10, 21, fontColor);
screen_blitText(TS_TIME); screen_blitText(TS_TIME);
@ -1835,15 +1834,13 @@ static void game_doHud()
if (game.area != MISN_INTERCEPTION) if (game.area != MISN_INTERCEPTION)
{ {
gfx_createTextObject(TS_OBJECTIVES_T, "Objectives Remaining:", screen->w - 250, 20, FONT_WHITE);
screen_blitText(TS_OBJECTIVES_T); screen_blitText(TS_OBJECTIVES_T);
sprintf(text, "%d", (mission.remainingObjectives1 + mission.remainingObjectives2)); sprintf(text, "%d", (mission.remainingObjectives1 + mission.remainingObjectives2));
gfx_createTextObject(TS_OBJECTIVES, text, screen->w - 55, 21, FONT_WHITE); gfx_createTextObject(TS_OBJECTIVES, text, screen->w - 55, 21, FONT_WHITE);
screen_blitText(TS_OBJECTIVES); screen_blitText(TS_OBJECTIVES);
} }
gfx_createTextObject(TS_CASH_T, "Cash: $", 25, 20, FONT_WHITE); screen_blitText(TS_CASH_T); // cash
screen_blitText(TS_CASH_T);
sprintf(text, "%.6d", game.cash); sprintf(text, "%.6d", game.cash);
gfx_createTextObject(TS_CASH, text, 90, 21, FONT_WHITE); gfx_createTextObject(TS_CASH, text, 90, 21, FONT_WHITE);
screen_blitText(TS_CASH); screen_blitText(TS_CASH);
@ -1880,19 +1877,11 @@ static void game_doHud()
if (player.ammo[0] <= 25) fontColor = FONT_YELLOW; if (player.ammo[0] <= 25) fontColor = FONT_YELLOW;
if (player.ammo[0] <= 10) fontColor = FONT_RED; if (player.ammo[0] <= 10) fontColor = FONT_RED;
} }
gfx_createTextObject(TS_PLASMA_T, "Plasma:", screen->w * 5 / 16, screen->h - 50, FONT_WHITE);
screen_blitText(TS_PLASMA_T); screen_blitText(TS_PLASMA_T);
sprintf(text, "%.3d", player.ammo[0]); sprintf(text, "%.3d", player.ammo[0]);
gfx_createTextObject(TS_PLASMA, text, screen->w * 5 / 16 + 70, screen->h - 49, fontColor); gfx_createTextObject(TS_PLASMA, text, screen->w * 5 / 16 + 70, screen->h - 49, fontColor);
screen_blitText(TS_PLASMA); screen_blitText(TS_PLASMA);
if (player.weaponType[1] == W_CHARGER)
gfx_createTextObject(TS_AMMO_T, "Charge", screen->w / 2, screen->h - 50, FONT_WHITE);
else if (player.weaponType[1] == W_LASER)
gfx_createTextObject(TS_AMMO_T, "Heat", screen->w / 2 + 20, screen->h - 50, FONT_WHITE);
else
gfx_createTextObject(TS_AMMO_T, "Rockets:", screen->w / 2, screen->h - 50, FONT_WHITE);
screen_blitText(TS_AMMO_T); screen_blitText(TS_AMMO_T);
if ((player.weaponType[1] != W_CHARGER) && (player.weaponType[1] != W_LASER)) if ((player.weaponType[1] != W_CHARGER) && (player.weaponType[1] != W_LASER))
@ -2011,11 +2000,6 @@ static void game_doHud()
if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) && if ((engine.targetIndex > -1) && (aliens[engine.targetIndex].shield > 0) &&
(engine.targetIndex > engine.maxAliens)) (engine.targetIndex > engine.maxAliens))
{ {
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_TARGET_KLINE, "Kline", screen->w * 11 / 16 + 9, screen->h - 50, FONT_WHITE);
if (game.difficulty == DIFFICULTY_ORIGINAL) if (game.difficulty == DIFFICULTY_ORIGINAL)
{ {
screen_blitText(TS_TARGET); screen_blitText(TS_TARGET);
@ -2052,7 +2036,6 @@ static void game_doHud()
} }
} }
gfx_createTextObject(TS_POWER, "Power", screen->w / 32, screen->h - 30, FONT_WHITE);
screen_blitText(TS_POWER); screen_blitText(TS_POWER);
bar.w = screen->w / 32; bar.w = screen->w / 32;
@ -2072,7 +2055,6 @@ static void game_doHud()
bar.x += screen->w * 3 / 80; bar.x += screen->w * 3 / 80;
} }
gfx_createTextObject(TS_OUTPUT, "Output", screen->w * 5 / 16, screen->h - 30, FONT_WHITE);
screen_blitText(TS_OUTPUT); screen_blitText(TS_OUTPUT);
bar.w = screen->w / 32; bar.w = screen->w / 32;
@ -2094,7 +2076,6 @@ static void game_doHud()
bar.x += screen->w * 3 / 80; bar.x += screen->w * 3 / 80;
} }
gfx_createTextObject(TS_COOLER, "Cooler", screen->w * 97 / 160, screen->h - 30, FONT_WHITE);
screen_blitText(TS_COOLER); screen_blitText(TS_COOLER);
bar.w = screen->w / 32; bar.w = screen->w / 32;
@ -2115,7 +2096,6 @@ static void game_doHud()
bar.x += screen->w * 3 / 80; bar.x += screen->w * 3 / 80;
} }
gfx_createTextObject(TS_SHIELD, "Shield", screen->w / 32, screen->h - 50, FONT_WHITE);
screen_blitText(TS_SHIELD); screen_blitText(TS_SHIELD);
if (player.shield < 1) if (player.shield < 1)
return; return;

20
src/mission.c
View File

@ -1046,6 +1046,26 @@ void mission_showStartScreen()
renderer_update(); renderer_update();
gfx_loadSprites(); gfx_loadSprites();
gfx_createTextObject(TS_SHIELD, "Shield", screen->w / 32, screen->h - 50, FONT_WHITE);
gfx_createTextObject(TS_PLASMA_T, "Plasma:", screen->w * 5 / 16, screen->h - 50, FONT_WHITE);
if (player.weaponType[1] == W_CHARGER)
gfx_createTextObject(TS_AMMO_T, "Charge", screen->w / 2, screen->h - 50, FONT_WHITE);
else if (player.weaponType[1] == W_LASER)
gfx_createTextObject(TS_AMMO_T, "Heat", screen->w / 2 + 20, screen->h - 50, FONT_WHITE);
else
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_TARGET_KLINE, "Kline", screen->w * 11 / 16 + 9, 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);
gfx_createTextObject(TS_POWER, "Power", screen->w / 32, screen->h - 30, FONT_WHITE);
gfx_createTextObject(TS_OUTPUT, "Output", screen->w * 5 / 16, screen->h - 30, FONT_WHITE);
gfx_createTextObject(TS_COOLER, "Cooler", screen->w * 97 / 160, screen->h - 30, FONT_WHITE);
audio_playRandomTrack(); audio_playRandomTrack();
if (game.area != MISN_INTERCEPTION) if (game.area != MISN_INTERCEPTION)