From d2806393bb29fa2fed76c5ffa9e8981a38a1ac97 Mon Sep 17 00:00:00 2001 From: sirlemonhead Date: Wed, 10 Jun 2020 22:38:22 +0100 Subject: [PATCH] PCExhumed: Add code to draw serpent cam status text on screen # Conflicts: # source/exhumed/src/sound.cpp # source/exhumed/src/status.h --- source/exhumed/src/status.cpp | 9 +++++---- source/exhumed/src/status.h | 6 +----- source/exhumed/src/view.cpp | 2 ++ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/source/exhumed/src/status.cpp b/source/exhumed/src/status.cpp index 521bff3cb..0a0c42631 100644 --- a/source/exhumed/src/status.cpp +++ b/source/exhumed/src/status.cpp @@ -673,6 +673,11 @@ void StatusMessage(int messageTime, const char *fmt, ...) } } +void DrawSnakeCamStatus() +{ + printext(0, 0, "S E R P E N T C A M", kTile159, 255); +} + void DrawStatus() { char numberBuf[10] = {0}; @@ -844,10 +849,6 @@ void DrawStatus() printext(0, 0, message_text, kTile159, 255); } } - else - { - printext(0, 0, "S E R P E N T C A M", kTile159, 255); - } } // I'm not sure this really needs to be saved. diff --git a/source/exhumed/src/status.h b/source/exhumed/src/status.h index 826c88a5e..d0d261364 100644 --- a/source/exhumed/src/status.h +++ b/source/exhumed/src/status.h @@ -35,16 +35,12 @@ void SetPlayerItem(short nPlayer, short nItem); void SetMagicFrame(); void SetHealthFrame(short nVal); void SetAirFrame(); - void MoveStatus(); - +void DrawSnakeCamStatus(); void DrawStatus(); - int BuildStatusAnim(int val, int nFlags); - void SetNextItem(int nPlayer); void SetPrevItem(int nPlayer); - void SetCounter(short nVal); void SetCounterImmediate(short nVal); diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp index 65ac09792..1914c29a9 100644 --- a/source/exhumed/src/view.cpp +++ b/source/exhumed/src/view.cpp @@ -583,6 +583,8 @@ void DrawView(int smoothRatio, bool sceneonly) if (!bFullScreen) { MaskStatus(); } + + DrawSnakeCamStatus(); } } }