diff --git a/src/g_statusbar/sbar.h b/src/g_statusbar/sbar.h index cf17a5354..3c911e693 100644 --- a/src/g_statusbar/sbar.h +++ b/src/g_statusbar/sbar.h @@ -385,9 +385,7 @@ public: protected: void DrawPowerups (); - void DrawImage (FTexture *image, int x, int y, FRemapTable *translation=NULL) const; - void DrawDimImage (FTexture *image, int x, int y, bool dimmed) const; - + void RefreshBackground () const; void GetCurrentAmmo (AInventory *&ammo1, AInventory *&ammo2, int &ammocount1, int &ammocount2) const; diff --git a/src/g_statusbar/shared_sbar.cpp b/src/g_statusbar/shared_sbar.cpp index 81655d2ab..a0c825df5 100644 --- a/src/g_statusbar/shared_sbar.cpp +++ b/src/g_statusbar/shared_sbar.cpp @@ -535,48 +535,6 @@ void DBaseStatusBar::ShowPlayerName () 1.5f, 0.92f, 0, 0, color, 2.f, 0.35f), MAKE_ID('P','N','A','M')); } -//--------------------------------------------------------------------------- -// -// PROC DrawImage -// -// Draws an image with the status bar's upper-left corner as the origin. -// -//--------------------------------------------------------------------------- - -void DBaseStatusBar::DrawImage (FTexture *img, - int x, int y, FRemapTable *translation) const -{ - if (img != NULL) - { - screen->DrawTexture (img, x + ST_X, y + ST_Y, - DTA_Translation, translation, - DTA_Bottom320x200, Scaled, - TAG_DONE); - } -} - -//--------------------------------------------------------------------------- -// -// PROC DrawImage -// -// Draws an optionally dimmed image with the status bar's upper-left corner -// as the origin. -// -//--------------------------------------------------------------------------- - -void DBaseStatusBar::DrawDimImage (FTexture *img, - int x, int y, bool dimmed) const -{ - if (img != NULL) - { - screen->DrawTexture (img, x + ST_X, y + ST_Y, - DTA_ColorOverlay, dimmed ? DIM_OVERLAY : 0, - DTA_Bottom320x200, Scaled, - TAG_DONE); - } -} - - //--------------------------------------------------------------------------- // // RefreshBackground diff --git a/src/g_statusbar/strife_sbar.cpp b/src/g_statusbar/strife_sbar.cpp index 43624c2fa..d2511c42d 100644 --- a/src/g_statusbar/strife_sbar.cpp +++ b/src/g_statusbar/strife_sbar.cpp @@ -848,6 +848,8 @@ private: void DrINumberOuter(signed int val, int x, int y, bool center = false, int w = 9) const; void DrBNumberOuterFont(signed int val, int x, int y, int w = 3) const; + void DrawDimImage(FTexture *image, int x, int y, bool dimmed) const; + void DrawImage(FTexture *image, int x, int y, FRemapTable *translation = NULL) const; }; @@ -1017,6 +1019,48 @@ void DStrifeStatusBar::DrBNumberOuterFont(signed int val, int x, int y, int size } } +//--------------------------------------------------------------------------- +// +// PROC DrawImage +// +// Draws an image with the status bar's upper-left corner as the origin. +// +//--------------------------------------------------------------------------- + +void DStrifeStatusBar::DrawImage(FTexture *img, + int x, int y, FRemapTable *translation) const +{ + if (img != NULL) + { + screen->DrawTexture(img, x + ST_X, y + ST_Y, + DTA_Translation, translation, + DTA_Bottom320x200, Scaled, + TAG_DONE); + } +} + +//--------------------------------------------------------------------------- +// +// PROC DrawImage +// +// Draws an optionally dimmed image with the status bar's upper-left corner +// as the origin. +// +//--------------------------------------------------------------------------- + +void DStrifeStatusBar::DrawDimImage(FTexture *img, + int x, int y, bool dimmed) const +{ + if (img != NULL) + { + screen->DrawTexture(img, x + ST_X, y + ST_Y, + DTA_ColorOverlay, dimmed ? DIM_OVERLAY : 0, + DTA_Bottom320x200, Scaled, + TAG_DONE); + } +} + +