OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Added: inventorybarnotvisible to check to see if the inventory bar is up.

Browse source 
- Added the following flags to drawselectedinventory center, centerbottom, and
  drawshadow.
- Fixed: The translucent flag for drawinventorybar should only have affected
  the artibox image.

- Fixed: compatf_limitpain must check for 21 Lost Souls, not 20.


SVN r1297 (trunk)
This commit is contained in:
Christoph Oelckers 2008-11-29 16:37:54 +00:00
commit 6b9129105a
6 changed files with 74 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/g_shared/sbarinfo_parser.cpp
View file

@ -97,6 +97,7 @@ static const char *SBarInfoRoutineLevel[] =
"isselected",
"usessecondaryammo",
"hasweaponpiece",
"inventorybarnotvisible",
"weaponammo", //event
"ininventory",
NULL
@ -510,7 +511,7 @@ void SBarInfo::ParseSBarInfoBlock(FScanner &sc, SBarInfoBlock &block)
else if(sc.Compare("centerbottom"))
cmd.flags |= DRAWIMAGE_OFFSET_CENTERBOTTOM;
else
sc.ScriptError("Expected 'center' or 'centerbottom' got '%s' instead.", sc.String);
sc.ScriptError("'%s' is not a valid alignment.", sc.String);
}
sc.MustGetToken(';');
break;
@ -715,6 +716,18 @@ void SBarInfo::ParseSBarInfoBlock(FScanner &sc, SBarInfoBlock &block)
{
cmd.flags |= DRAWSELECTEDINVENTORY_ALWAYSSHOWCOUNTER;
}
else if(sc.Compare("center"))
{
cmd.flags |= DRAWSELECTEDINVENTORY_CENTER;
}
else if(sc.Compare("centerbottom"))
{
cmd.flags |= DRAWSELECTEDINVENTORY_CENTERBOTTOM;
}
else if(sc.Compare("drawshadow"))
{
cmd.flags |= DRAWSELECTEDINVENTORY_DRAWSHADOW;
}
else
{
cmd.font = V_GetFont(sc.String);
@ -1207,6 +1220,11 @@ void SBarInfo::ParseSBarInfoBlock(FScanner &sc, SBarInfoBlock &block)
this->ParseSBarInfoBlock(sc, cmd.subBlock);
break;
}
case SBARINFO_INVENTORYBARNOTVISIBLE:
sc.MustGetToken('{');
cmd.subBlock.fullScreenOffsets = block.fullScreenOffsets;
this->ParseSBarInfoBlock(sc, cmd.subBlock);
break;
case SBARINFO_WEAPONAMMO:
sc.MustGetToken(TK_Identifier);
if(sc.Compare("not"))