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

- Let FPlayerNameBox::DrawBorder decide what graphics to use based on actual presence in the WADs, not the gamemode. 

SVN r2953 (trunk)
This commit is contained in:
Christoph Oelckers 2010-10-17 08:29:21 +00:00
parent 94fd56b6bd
commit fe0c7bc7f9
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/menu/playermenu.cpp
View File

@ -115,23 +115,34 @@ bool FPlayerNameBox::GetString(int i, char *s, int len)
void FPlayerNameBox::DrawBorder (int x, int y, int len)
{
if (gameinfo.gametype & (GAME_DoomStrifeChex))
FTexture *left = TexMan[TexMan.CheckForTexture("M_LSLEFT", FTexture::TEX_MiscPatch)];
FTexture *mid = TexMan[TexMan.CheckForTexture("M_LSCNTR", FTexture::TEX_MiscPatch)];
FTexture *right = TexMan[TexMan.CheckForTexture("M_LSRGHT", FTexture::TEX_MiscPatch)];
if (left != NULL && right != NULL && mid != NULL)
{
int i;
screen->DrawTexture (TexMan["M_LSLEFT"], x-8, y+7, DTA_Clean, true, TAG_DONE);
screen->DrawTexture (left, x-8, y+7, DTA_Clean, true, TAG_DONE);
for (i = 0; i < len; i++)
{
screen->DrawTexture (TexMan["M_LSCNTR"], x, y+7, DTA_Clean, true, TAG_DONE);
screen->DrawTexture (mid, x, y+7, DTA_Clean, true, TAG_DONE);
x += 8;
}
screen->DrawTexture (TexMan["M_LSRGHT"], x, y+7, DTA_Clean, true, TAG_DONE);
screen->DrawTexture (right, x, y+7, DTA_Clean, true, TAG_DONE);
}
else
{
screen->DrawTexture (TexMan["M_FSLOT"], x, y+1, DTA_Clean, true, TAG_DONE);
FTexture *slot = TexMan[TexMan.CheckForTexture("M_FSLOT", FTexture::TEX_MiscPatch)];
if (slot != NULL)
{
screen->DrawTexture (slot, x, y+1, DTA_Clean, true, TAG_DONE);
}
else
{
screen->Clear(x, y, x + len, y + SmallFont->GetHeight() * 3/2, -1, 0);
}
}
}

8
src/namedef.h
View File

@ -105,12 +105,6 @@ xx(ArtiPoisonBag3)
// Strife quests
xx(QuestItem)
// Auto-usable health items
xx(ArtiHealth)
xx(ArtiSuperHealth)
xx(MedicalKit)
xx(MedPatch)
// Armor
xx(BasicArmor)
@ -186,7 +180,6 @@ xx(Greetings)
xx(Idle)
xx(GenericFreezeDeath)
xx(GenericCrush)
xx(Cast)
// Compatible death names for the decorate parser.
xx(XDeath)
@ -252,6 +245,7 @@ xx(PoisonCloud) // makes monsters howl.
// a damage type if you wanted to force an extreme death.
xx(Extreme)
xx(MDK)
xx(Cast) // 'damage type' for the cast call
// Special names for thingdef_exp.cpp
xx(Random)