zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-18 22:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- marked all virtual overrides in DSBarInfo with the 'override' keyword so that I do not have to search for them again.

Browse source
This commit is contained in:
Christoph Oelckers 2017-01-20 01:42:21 +01:00
parent c880b26d98
commit 9d828a7ca0
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/g_shared/sbarinfo.cpp
View file

@ -1010,7 +1010,7 @@ public:
Images.Uninit(); Images.Uninit();
} }
void ScreenSizeChanged() void ScreenSizeChanged() override
{ {
Super::ScreenSizeChanged(); Super::ScreenSizeChanged();
if (uiscale > 0) if (uiscale > 0)
@ -1024,7 +1024,7 @@ public:
} }
} }
void Draw (EHudState state) void Draw (EHudState state) override
{ {
DBaseStatusBar::Draw(state); DBaseStatusBar::Draw(state);
if (script->cleanX <= 0) if (script->cleanX <= 0)
@ -1129,7 +1129,7 @@ public:
hud_scale = oldhud_scale; hud_scale = oldhud_scale;
} }
void NewGame () void NewGame () override
{ {
if (CPlayer != NULL) if (CPlayer != NULL)
{ {
@ -1141,17 +1141,17 @@ public:
} }
} }
bool MustDrawLog (EHudState state) bool MustDrawLog (EHudState state) override
{ {
return script->huds[STBAR_POPUPLOG]->NumCommands() == 0; return script->huds[STBAR_POPUPLOG]->NumCommands() == 0;
} }
void SetMugShotState (const char *state_name, bool wait_till_done, bool reset) void SetMugShotState (const char *state_name, bool wait_till_done, bool reset) override
{ {
script->MugShot.SetState(state_name, wait_till_done, reset); script->MugShot.SetState(state_name, wait_till_done, reset);
} }
void Tick () void Tick () override
{ {
DBaseStatusBar::Tick(); DBaseStatusBar::Tick();
@ -1175,15 +1175,15 @@ public:
lastInventoryBar->Tick(NULL, this, false); lastInventoryBar->Tick(NULL, this, false);
} }
void ReceivedWeapon(AWeapon *weapon) void ReceivedWeapon(AWeapon *weapon) override
{ {
script->MugShot.Grin(); script->MugShot.Grin();
} }
// void DSBarInfo::FlashItem(const PClass *itemtype) - Is defined with CommandDrawSelectedInventory // void DSBarInfo::FlashItem(const PClass *itemtype) - Is defined with CommandDrawSelectedInventory
void FlashItem(const PClass *itemtype); void FlashItem(const PClass *itemtype) override;
void ShowPop(int popnum) void ShowPop(int popnum) override
{ {
DBaseStatusBar::ShowPop(popnum); DBaseStatusBar::ShowPop(popnum);
if(popnum != currentPopup) if(popnum != currentPopup)