Added new color for boss health (#694)

ModusCreateOrg · Nov 5, 2020 · 71c05c2 · 71c05c2
1 parent bb30636
commit 71c05c2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/src/GResources.h b/src/GResources.h
@@ -385,6 +385,7 @@ const TUint16 IMG_GREEN_BOTTLE3 = 126; // 75% full
 const TUint16 IMG_GREEN_BOTTLE4 = 127; // 100% full
 
 //// RESERVED COLORS
+const TUint8 COLOR_ENEMY_HEALTH = 239;  // for hit/flash animations, etc.
 const TUint8 COLOR_WHITE = 240;  // for hit/flash animations, etc.
 const TUint8 COLOR_SHADOW = 241;
 const TUint8 COLOR_SHMOO_RED = 242;

diff --git a/src/GameState/GAnchorSprite.cpp b/src/GameState/GAnchorSprite.cpp
@@ -199,8 +199,8 @@ TBool GAnchorSprite::Render(BViewPort *aViewPort) {
     // render sprite border if sprite is visible
     if (TestFlags(SFLAG_RENDER)) {
       bm.DrawRect(aViewPort, mRect, COLOR_WHITE);
-      bm.DrawFastHLine(aViewPort, mRect.x1 - 5, mRect.y2, 10, COLOR_HEALTH);
-      bm.DrawFastVLine(aViewPort, mRect.x1, mRect.y2 - 5, 10, COLOR_HEALTH);
+      bm.DrawFastHLine(aViewPort, mRect.x1 - 5, mRect.y2, 10, COLOR_ENEMY_HEALTH);
+      bm.DrawFastVLine(aViewPort, mRect.x1, mRect.y2 - 5, 10, COLOR_ENEMY_HEALTH);
 //      bm.DrawString(aViewPort, Name(), gFont8x8, mRect.x1 + 1, mRect.y2 + 1, COLOR_TEXT, COLOR_TEXT_TRANSPARENT, -1);
       switch (mDirection) {
         case DIRECTION_UP:

diff --git a/src/GameState/GGameState.cpp b/src/GameState/GGameState.cpp
@@ -179,6 +179,7 @@ void GGameState::PreRender() {
     }
   }
   gDisplay.SetColor(COLOR_WHITE, 255, 255, 255);
+  gDisplay.SetColor(COLOR_ENEMY_HEALTH, 0xff, 0x59, 0x43);
 }
 
 /*******************************************************************************

diff --git a/src/GameState/GHud.cpp b/src/GameState/GHud.cpp
@@ -99,7 +99,7 @@ void GHud::Render() {
 
   if (healthPct < .10f && frame % 30 == 0)  {
     darkHealth = ! darkHealth;
-    if (darkHealth) {
+    if (darkHealth && gGame->GetState() == GAME_STATE_GAME) {
       gSoundPlayer.TriggerSfx(SFX_PLAYER_LOW_HEALTH_WAV, 2);
     }
 
@@ -159,7 +159,7 @@ void GHud::Render() {
     gDisplay.renderBitmap->FillRect(gViewPort, 20, h - 16, 21 + STAT_WIDTH, h - 12, COLOR_TEXT);
     if (boss->mHitPoints > 0) {
       gDisplay.renderBitmap->FillRect(gViewPort, 20, h - 16, 21 + boss->mHitPoints * STAT_WIDTH / boss->mMaxHitPoints,
-                                      h - 12, COLOR_HEALTH2);
+                                      h - 12, COLOR_ENEMY_HEALTH);
     }
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -179,6 +179,7 @@ void GGameState::PreRender() { @@
         }
       }
       gDisplay.SetColor(COLOR_WHITE, 255, 255, 255);
+      gDisplay.SetColor(COLOR_ENEMY_HEALTH, 0xff, 0x59, 0x43);
     }
     /*******************************************************************************
@@ Expand Down @@