OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- scriptified the SBARINFO wrapper.

Browse source 
This serves no purpose in itself but it removes a native side class from the status bar class hierarchy which allows for better editing options later.
This commit is contained in:
Christoph Oelckers 2017-03-22 17:29:13 +01:00
commit 1423d5f42a
14 changed files with 232 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/g_level.cpp
View file

@ -444,7 +444,8 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
if (bTitleLevel)
{
StatusBar = new DBaseStatusBar (0);
StatusBar = new DBaseStatusBar ();
StatusBar->SetSize(0);
}
else if (cls && gameinfo.gametype == GAME_Doom)
{
@ -480,11 +481,12 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
}
else
{
StatusBar = new DBaseStatusBar (0);
StatusBar = new DBaseStatusBar();
StatusBar->SetSize(0);
}
}
GC::WriteBarrier(StatusBar);
StatusBar->CallAttachToPlayer (&players[consoleplayer]);
StatusBar->AttachToPlayer (&players[consoleplayer]);
StatusBar->NewGame ();
setsizeneeded = true;
@ -1090,7 +1092,7 @@ void G_DoLoadLevel (int position, bool autosave)
FBehavior::StaticStartTypedScripts(SCRIPT_Reopen, NULL, false);
}
StatusBar->CallAttachToPlayer (&players[consoleplayer]);
StatusBar->AttachToPlayer (&players[consoleplayer]);
// unsafe world load
E_WorldLoadedUnsafe();
// regular world load (savegames are handled internally)