zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/coelckers/gzdoom

This commit is contained in:
Rachael Alexanderson 2017-03-31 14:58:45 -04:00
parent bf9edec91a f48af606df
commit 24b6924428
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/g_statusbar/sbarinfo.cpp
View File

@ -1546,11 +1546,6 @@ DBaseStatusBar *CreateCustomStatusBar(int scriptno)
I_FatalError("Tried to create a status bar with no script!"); I_FatalError("Tried to create a status bar with no script!");
auto sbar = (DBaseStatusBar*)PClass::FindClass("SBarInfoWrapper")->CreateNew(); auto sbar = (DBaseStatusBar*)PClass::FindClass("SBarInfoWrapper")->CreateNew();
IFVIRTUALPTR(sbar, DBaseStatusBar, Init)
{
VMValue params[] = { sbar };
GlobalVMStack.Call(func, params, 1, nullptr, 0);
}
auto core = new DSBarInfo(sbar, script); auto core = new DSBarInfo(sbar, script);
sbar->PointerVar<DSBarInfo>("core") = core; sbar->PointerVar<DSBarInfo>("core") = core;
sbar->SetSize(script->height, script->_resW, script->_resH); sbar->SetSize(script->height, script->_resW, script->_resH);

33
src/g_statusbar/shared_sbar.cpp
View File

@ -251,6 +251,17 @@ void ST_Clear()
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static void CreateBaseStatusBar()
{
assert(nullptr == StatusBar);
PClass* const statusBarClass = PClass::FindClass("BaseStatusBar");
assert(nullptr != statusBarClass);
StatusBar = static_cast<DBaseStatusBar*>(statusBarClass->CreateNew());
StatusBar->SetSize(0);
}
void ST_CreateStatusBar(bool bTitleLevel) void ST_CreateStatusBar(bool bTitleLevel)
{ {
if (StatusBar != NULL) if (StatusBar != NULL)
@ -261,8 +272,7 @@ void ST_CreateStatusBar(bool bTitleLevel)
if (bTitleLevel) if (bTitleLevel)
{ {
StatusBar = new DBaseStatusBar(); CreateBaseStatusBar();
StatusBar->SetSize(0);
} }
else else
{ {
@ -277,11 +287,6 @@ void ST_CreateStatusBar(bool bTitleLevel)
if (cls != nullptr) if (cls != nullptr)
{ {
StatusBar = (DBaseStatusBar *)cls->CreateNew(); StatusBar = (DBaseStatusBar *)cls->CreateNew();
IFVIRTUALPTR(StatusBar, DBaseStatusBar, Init)
{
VMValue params[] = { StatusBar };
GlobalVMStack.Call(func, params, 1, nullptr, 0);
}
} }
} }
} }
@ -313,18 +318,18 @@ void ST_CreateStatusBar(bool bTitleLevel)
if (cls != nullptr) if (cls != nullptr)
{ {
StatusBar = (DBaseStatusBar *)cls->CreateNew(); StatusBar = (DBaseStatusBar *)cls->CreateNew();
IFVIRTUALPTR(StatusBar, DBaseStatusBar, Init)
{
VMValue params[] = { StatusBar };
GlobalVMStack.Call(func, params, 1, nullptr, 0);
}
} }
} }
} }
if (StatusBar == nullptr) if (StatusBar == nullptr)
{ {
StatusBar = new DBaseStatusBar(); CreateBaseStatusBar();
StatusBar->SetSize(0); }
IFVIRTUALPTR(StatusBar, DBaseStatusBar, Init)
{
VMValue params[] = { StatusBar };
GlobalVMStack.Call(func, params, 1, nullptr, 0);
} }
GC::WriteBarrier(StatusBar); GC::WriteBarrier(StatusBar);