diff --git a/docs/rh-log.txt b/docs/rh-log.txt index c77276a543..89ebdf4958 100644 --- a/docs/rh-log.txt +++ b/docs/rh-log.txt @@ -1,10 +1,18 @@ +November 29, 2008 +- It is now possible to replace the game's SmallFont with a single lump font + called SMALLFNT. +- Reduced the width of the second column in wi_percents false mode from 3 to + 2 characters. +- Added a WISLASH graphic for Doom's intermission screen when wi_percents is + false. + November 29, 2008 (sbarinfo update) - Added: inventorybarnotvisible to check to see if the inventory bar is up. - Added the following flags to drawselectedinventory center, centerbottom, and drawshadow. - Fixed: The translucent flag for drawinventorybar should only have affected the artibox image. - + November 27, 2008 - Removed S_MarkSoundChannels(), as it caused all non-actor sounds to have their origins zeroed during collections. diff --git a/src/hu_scores.cpp b/src/hu_scores.cpp index 66d3f6344e..260cf5845d 100644 --- a/src/hu_scores.cpp +++ b/src/hu_scores.cpp @@ -280,9 +280,9 @@ static void HU_DrawTimeRemaining (int y) seconds = timeleft / TICRATE; if (hours) - mysnprintf (str, countof(str), "Level ends in %02d:%02d:%02d", hours, minutes, seconds); + mysnprintf (str, countof(str), "Level ends in %d:%02d:%02d", hours, minutes, seconds); else - mysnprintf (str, countof(str), "Level ends in %02d:%02d", minutes, seconds); + mysnprintf (str, countof(str), "Level ends in %d:%02d", minutes, seconds); screen->DrawText (SmallFont, CR_GREY, SCREENWIDTH/2 - SmallFont->StringWidth (str)/2*CleanXfac, y, str, DTA_CleanNoMove, true, TAG_DONE); diff --git a/src/v_font.cpp b/src/v_font.cpp index 308c0eddbe..0c049b882f 100644 --- a/src/v_font.cpp +++ b/src/v_font.cpp @@ -1527,7 +1527,7 @@ FSpecialFont::FSpecialFont (const char *name, int first, int count, int *lumplis int TotalColors; FTexture *pic; - Name=copystring(name); + Name = copystring(name); Chars = new CharData[count]; charlumps = new int[count]; PatchRemap = new BYTE[256]; @@ -1549,7 +1549,7 @@ FSpecialFont::FSpecialFont (const char *name, int first, int count, int *lumplis Wads.GetLumpName(buffer, lump); if (buffer[0] != 0) { - buffer[8]=0; + buffer[8] = 0; pic = TexMan[buffer]; } else @@ -1725,8 +1725,11 @@ void V_InitCustomFonts() if (format == 1) goto wrong; int *p = &lumplist[*(unsigned char*)sc.String]; sc.MustGetString(); - *p = Wads.CheckNumForFullName (sc.String, true); - format=2; + if (-1 == (*p = Wads.CheckNumForFullName (sc.String, true))) + { + *p = Wads.CheckNumForFullName (sc.String, true, ns_graphics); + } + format = 2; } } if (format == 1) @@ -2102,7 +2105,13 @@ void V_InitFonts() // load the heads-up font if (!(SmallFont = FFont::FindFont("SmallFont"))) { - if (Wads.CheckNumForName ("FONTA_S") >= 0) + int i; + + if ((i = Wads.CheckNumForName("SMALLFNT")) >= 0) + { + SmallFont = new FSingleLumpFont("SmallFont", i); + } + else if (Wads.CheckNumForName ("FONTA_S") >= 0) { SmallFont = new FFont ("SmallFont", "FONTA%02u", HU_FONTSTART, HU_FONTSIZE, 1); } @@ -2111,7 +2120,7 @@ void V_InitFonts() SmallFont = new FFont ("SmallFont", "STCFN%.3d", HU_FONTSTART, HU_FONTSIZE, HU_FONTSTART); } } - if (!(SmallFont2 = FFont::FindFont("SmallFont2"))) + if (!(SmallFont2 = FFont::FindFont("SmallFont2"))) // Only used by Strife { if (Wads.CheckNumForName ("STBFN033", ns_graphics) >= 0) { diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index dc424e1c68..8c41f6c011 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -937,10 +937,9 @@ void WI_drawPercent (int x, int y, int p, int b, bool show_total=true) x += IntermissionFont->GetCharWidth('%'); if (show_total) { - int y2 = y + IntermissionFont->GetHeight() - BigFont->GetHeight(); - x = WI_drawNum(x, y, b, 3, false); - x -= BigFont->GetCharWidth('/'); - screen->DrawText (BigFont, gameinfo.gametype & GAME_Doom ? CR_RED : CR_UNTRANSLATED, x, y2, "/", + x = WI_drawNum(x, y, b, 2, false); + x -= IntermissionFont->GetCharWidth('/'); + screen->DrawText (IntermissionFont, CR_UNTRANSLATED, x, y, "/", DTA_Clean, true, TAG_DONE); } WI_drawNum (x, y, p, -1, false); diff --git a/wadsrc/static/fontdefs.txt b/wadsrc/static/fontdefs.txt index 86eb7c349d..9c2d091da8 100644 --- a/wadsrc/static/fontdefs.txt +++ b/wadsrc/static/fontdefs.txt @@ -64,4 +64,5 @@ IntermissionFont_Doom 8 WINUM8 9 WINUM9 - WIMINUS + / WISLASH } diff --git a/wadsrc/static/graphics/wislash.lmp b/wadsrc/static/graphics/wislash.lmp new file mode 100644 index 0000000000..68f80c35de Binary files /dev/null and b/wadsrc/static/graphics/wislash.lmp differ