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

Fixed health bar.

This commit is contained in:
Layla Marchant 2020-05-26 19:11:45 -04:00
parent b517275bd3
commit b689e2bcfb
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/engine.h
View File

@ -62,7 +62,6 @@ typedef struct Engine_ {
int lowShield; int lowShield;
int averageShield; int averageShield;
float targetShield;
int targetIndex; int targetIndex;
// Mission completion timer (allows for 4 seconds before leaving sector) // Mission completion timer (allows for 4 seconds before leaving sector)

27
src/game.c
View File

@ -1909,7 +1909,10 @@ static void game_doHud()
int fontColor; int fontColor;
int tTextIndex; int tTextIndex;
char text[STRMAX_SHORT]; char text[STRMAX_SHORT];
float nbars; // A float for the sake of float division
float shield_pct;
int i; int i;
int c;
screen_addBuffer(0, 20, screen->w, 25); screen_addBuffer(0, 20, screen->w, 25);
screen_addBuffer(0, screen->h - 50, screen->w, 34); screen_addBuffer(0, screen->h - 50, screen->w, 34);
@ -2013,7 +2016,7 @@ static void game_doHud()
if (((player.weaponType[1] == W_CHARGER) || (player.weaponType[1] == W_LASER)) && (player.ammo[1] > 0)) if (((player.weaponType[1] == W_CHARGER) || (player.weaponType[1] == W_LASER)) && (player.ammo[1] > 0))
{ {
int c = white; c = white;
if (player.ammo[1] > 100) if (player.ammo[1] > 100)
c = red; c = red;
@ -2021,7 +2024,7 @@ static void game_doHud()
bar.y = screen->h - 50; bar.y = screen->h - 50;
bar.h = 12; bar.h = 12;
for (int i = 0 ; i < (player.ammo[1] / 5) ; i++) for (i = 0 ; i < (player.ammo[1] / 5) ; i++)
{ {
bar.w = MAX(screen->w / 800, 1); bar.w = MAX(screen->w / 800, 1);
SDL_FillRect(screen, &bar, c); SDL_FillRect(screen, &bar, c);
@ -2084,7 +2087,7 @@ static void game_doHud()
} }
} }
for (int i = 0 ; i < MAX_INFOLINES ; i++) for (i = 0 ; i < MAX_INFOLINES ; i++)
{ {
if (gfx_textSprites[i].life > 0) if (gfx_textSprites[i].life > 0)
{ {
@ -2137,19 +2140,29 @@ static void game_doHud()
bar.h = 12; bar.h = 12;
bar.x = screen->w * 11 / 16 + gfx_textSprites[tTextIndex].image->w + 10; bar.x = screen->w * 11 / 16 + gfx_textSprites[tTextIndex].image->w + 10;
bar.y = screen->h - 50; bar.y = screen->h - 50;
nbars = 85.;
shield_pct = ((float)aliens[engine.targetIndex].shield
/ (float)aliens[engine.targetIndex].maxShield);
for (float i = 0 ; i < (engine.targetShield * aliens[engine.targetIndex].shield) ; i++) for (i = 0 ; i < nbars ; i++)
{ {
if (i > engine.targetShield * aliens[engine.targetIndex].maxShield * 2 / 3) if (i / nbars > 2. / 3)
shieldColor = green; shieldColor = green;
else if ((i >= engine.targetShield * aliens[engine.targetIndex].maxShield / 3) && else if (i / nbars > 1. / 3)
(i <= engine.targetShield * aliens[engine.targetIndex].maxShield * 2 / 3))
shieldColor = yellow; shieldColor = yellow;
else else
shieldColor = red; shieldColor = red;
if (i / nbars <= shield_pct)
{
SDL_FillRect(screen, &bar, shieldColor); SDL_FillRect(screen, &bar, shieldColor);
bar.x += bar.w + (screen->w / 800); bar.x += bar.w + (screen->w / 800);
} }
else
{
break;
}
}
} }
} }

2
src/player.c
View File

@ -82,8 +82,6 @@ void player_init()
void player_setTarget(int index) void player_setTarget(int index)
{ {
engine.targetIndex = index; engine.targetIndex = index;
engine.targetShield = 85;
engine.targetShield /= aliens[index].shield;
} }
/* /*