- The co-op summary screen now has a totals row at the bottom (if it fits).
- Changed WI_drawPercent() when wi_percents is false so that the total display is optional, and it formats it like Heretic's intermission, with a slash and a fixed-width right column. - Font is no longer a property of the screen object. Pass the font to DrawText and DrawChar directly instead. - Doom's intermission characters are now collected together as a font so they can be colorized. SVN r1294 (trunk)
This commit is contained in:
parent
904b59f266
commit
6e83d231fe
39 changed files with 471 additions and 556 deletions
|
|
@ -397,7 +397,7 @@ void F_TextWrite (void)
|
|||
|
||||
// draw some of the text onto the screen
|
||||
leftmargin = (gameinfo.gametype & (GAME_DoomStrifeChex|GAME_Hexen) ? 10 : 20) - 160;
|
||||
rowheight = screen->Font->GetHeight () +
|
||||
rowheight = SmallFont->GetHeight () +
|
||||
(gameinfo.gametype & (GAME_DoomStrifeChex) ? 3 : -1);
|
||||
scale = (CleanXfac != 1 || CleanYfac != 1);
|
||||
|
||||
|
|
@ -413,7 +413,7 @@ void F_TextWrite (void)
|
|||
ch = FinaleText.GetChars();
|
||||
|
||||
count = (FinaleCount - 10)/TEXTSPEED;
|
||||
range = screen->Font->GetColorTranslation (CR_UNTRANSLATED);
|
||||
range = SmallFont->GetColorTranslation (CR_UNTRANSLATED);
|
||||
|
||||
for ( ; count ; count-- )
|
||||
{
|
||||
|
|
@ -427,7 +427,7 @@ void F_TextWrite (void)
|
|||
continue;
|
||||
}
|
||||
|
||||
pic = screen->Font->GetChar (c, &w);
|
||||
pic = SmallFont->GetChar (c, &w);
|
||||
if (cx+w > SCREENWIDTH)
|
||||
continue;
|
||||
if (pic != NULL)
|
||||
|
|
@ -761,7 +761,7 @@ void F_CastDrawer (void)
|
|||
DTA_DestHeight, screen->GetHeight(),
|
||||
TAG_DONE);
|
||||
|
||||
screen->DrawText (CR_RED,
|
||||
screen->DrawText (SmallFont, CR_UNTRANSLATED,
|
||||
(SCREENWIDTH - SmallFont->StringWidth (GStrings(castorder[castnum].name)) * CleanXfac)/2,
|
||||
(SCREENHEIGHT * 180) / 200,
|
||||
GStrings(castorder[castnum].name),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue