diff options
author | erorcun <erayorcunus@gmail.com> | 2020-05-22 14:49:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-22 14:49:37 +0200 |
commit | 8b82e9c40f96f8fafc451bd589e31f2c10b643f5 (patch) | |
tree | 31af48c2f7af556b368bba1a726698b6a0f8a39a /src/render | |
parent | Merge pull request #577 from erorcun/miami (diff) | |
parent | focus loss improvement (diff) | |
download | re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.tar re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.tar.gz re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.tar.bz2 re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.tar.lz re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.tar.xz re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.tar.zst re3-8b82e9c40f96f8fafc451bd589e31f2c10b643f5.zip |
Diffstat (limited to 'src/render')
-rw-r--r-- | src/render/Hud.cpp | 38 | ||||
-rw-r--r-- | src/render/Hud.h | 3 |
2 files changed, 39 insertions, 2 deletions
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp index 96149573..00d5b5c7 100644 --- a/src/render/Hud.cpp +++ b/src/render/Hud.cpp @@ -38,7 +38,7 @@ CRGBA COUNTER_COLOR(97, 194, 247, 255); CRGBA PAGER_COLOR(32, 162, 66, 205); CRGBA RADARDISC_COLOR(255, 255, 255, 255); CRGBA BIGMESSAGE_COLOR(85, 119, 133, 255); -CRGBA WASTEDBUSTED_COLOR(170, 123, 87, 255); +CRGBA WASTEDBUSTED_COLOR(255, 150, 225, 255); CRGBA ODDJOB_COLOR(89, 115, 150, 255); CRGBA ODDJOB2_COLOR(156, 91, 40, 255); CRGBA MISSIONTITLE_COLOR(220, 172, 2, 255); @@ -923,7 +923,17 @@ void CHud::Draw() #else rect.Translate(RADAR_LEFT, SCREEN_SCALE_FROM_BOTTOM(RADAR_BOTTOM + RADAR_HEIGHT)); #endif - rect.Grow(4.0f); + + // shadow, might not be exactly accurate numbers + rect.Translate(0.f, 4.f); + rect.Grow(6.0f); + rect.top += 2.f; + rect.bottom -= 2.f; + Sprites[HUD_RADARDISC].Draw(rect, CRGBA(0, 0, 0, 255)); + + rect.Translate(0.f, -4.f); + rect.top -= 2.f; + rect.bottom += 2.f; Sprites[HUD_RADARDISC].Draw(rect, RADARDISC_COLOR); CRadar::DrawBlips(); } @@ -1480,6 +1490,30 @@ void CHud::GetRidOfAllHudMessages() } } +#ifdef RELOADABLES +void CHud::ReloadTXD() +{ + for (int i = 0; i < NUM_HUD_SPRITES; ++i) { + Sprites[i].Delete(); + } + + int HudTXD = CTxdStore::FindTxdSlot("hud"); + CTxdStore::RemoveTxdSlot(HudTXD); + + debug("Reloading HUD.TXD...\n"); + + HudTXD = CTxdStore::AddTxdSlot("hud"); + CTxdStore::LoadTxd(HudTXD, "MODELS/HUD.TXD"); + CTxdStore::AddRef(HudTXD); + CTxdStore::PopCurrentTxd(); + CTxdStore::SetCurrentTxd(HudTXD); + + for (int i = 0; i < NUM_HUD_SPRITES; i++) { + Sprites[i].SetTexture(WeaponFilenames[i].name, WeaponFilenames[i].mask); + } +} +#endif + void CHud::Initialise() { m_Wants_To_Draw_Hud = true; diff --git a/src/render/Hud.h b/src/render/Hud.h index 4c02827b..db92e32c 100644 --- a/src/render/Hud.h +++ b/src/render/Hud.h @@ -125,6 +125,9 @@ public: static void Draw(); static void DrawAfterFade(); static void GetRidOfAllHudMessages(); +#ifdef RELOADABLES + static void ReloadTXD(); +#endif static void Initialise(); static void ReInitialise(); static void SetBigMessage(wchar *message, int16 style); |