From 6e9ca1f29fdcc3ebc80b8e5b70ca42f1e77050a9 Mon Sep 17 00:00:00 2001 From: ewew ukek Date: Fri, 5 Apr 2024 00:07:00 +0000 Subject: Rename hp bar color identifiers for clarity Continuation of https://git.themanaworld.org/mana/plus/-/merge_requests/68#note_12819 I've renamed `*_HP2` to `*_HP_BG` and updated their descriptions. I didn't touch configuration keys intentionally. "Renamed *_HP -> *_HP_FG. Also decided to keep descriptions as is or else they become unreadable." See merge request mana/plus!71 --- src/being/being.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/being/being.cpp') diff --git a/src/being/being.cpp b/src/being/being.cpp index 1aef0abea..ed124b472 100644 --- a/src/being/being.cpp +++ b/src/being/being.cpp @@ -4003,8 +4003,8 @@ void Being::drawPlayerSpriteAt(Graphics *restrict const graphics, PlayerInfo::getAttribute(Attributes::PLAYER_MAX_HP), PlayerInfo::getAttribute(Attributes::PLAYER_HP), 0, - UserColorId::PLAYER_HP, - UserColorId::PLAYER_HP2, + UserColorId::PLAYER_HP_FG, + UserColorId::PLAYER_HP_BG, x - 50 + mapTileSize / 2 + mInfo->getHpBarOffsetX(), y + mapTileSize - 6 + mInfo->getHpBarOffsetY(), 2 * 50, @@ -4079,8 +4079,8 @@ void Being::drawMonsterSpriteAt(Graphics *restrict const graphics, maxHP, mHP, mDamageTaken, - UserColorId::MONSTER_HP, - UserColorId::MONSTER_HP2, + UserColorId::MONSTER_HP_FG, + UserColorId::MONSTER_HP_BG, x - 50 + mapTileSize / 2 + mInfo->getHpBarOffsetX(), y + mapTileSize - 6 + mInfo->getHpBarOffsetY(), 2 * 50, @@ -4133,8 +4133,8 @@ void Being::drawHomunculusSpriteAt(Graphics *restrict const graphics, maxHP, PlayerInfo::getStatBase(Attributes::HOMUN_HP), mDamageTaken, - UserColorId::HOMUN_HP, - UserColorId::HOMUN_HP2, + UserColorId::HOMUN_HP_FG, + UserColorId::HOMUN_HP_BG, x - 50 + mapTileSize / 2 + mInfo->getHpBarOffsetX(), y + mapTileSize - 6 + mInfo->getHpBarOffsetY(), 2 * 50, @@ -4188,8 +4188,8 @@ void Being::drawMercenarySpriteAt(Graphics *restrict const graphics, maxHP, PlayerInfo::getStatBase(Attributes::MERC_HP), mDamageTaken, - UserColorId::MERC_HP, - UserColorId::MERC_HP2, + UserColorId::MERC_HP_FG, + UserColorId::MERC_HP_BG, x - 50 + mapTileSize / 2 + mInfo->getHpBarOffsetX(), y + mapTileSize - 6 + mInfo->getHpBarOffsetY(), 2 * 50, @@ -4241,8 +4241,8 @@ void Being::drawElementalSpriteAt(Graphics *restrict const graphics, maxHP, PlayerInfo::getStatBase(Attributes::ELEMENTAL_HP), mDamageTaken, - UserColorId::ELEMENTAL_HP, - UserColorId::ELEMENTAL_HP2, + UserColorId::ELEMENTAL_HP_FG, + UserColorId::ELEMENTAL_HP_BG, x - 50 + mapTileSize / 2 + mInfo->getHpBarOffsetX(), y + mapTileSize - 6 + mInfo->getHpBarOffsetY(), 2 * 50, -- cgit v1.2.3-70-g09d2