Refactor: Removed WI_DrawPatch4. Text color and alpha are now members…

… of the

font renderer state and are assumed to be configured prior to calling any of
the WI_DrawPatch* family of functions.

doomsday/plugins/common/include/hu_stuff.h

@@ -154,12 +154,7 @@ const char* Hu_ChoosePatchReplacement(patchid_t patchId);
  * @param patchFlags  @see drawPatchFlags
  * @param textFlags  @see drawTextFlags
  * @param fontId  Used with patch replacement; default font.
- * @param r  Used with patch replacement; default text color red color component.
- * @param g  Used with patch replacement; default text color green color component.
- * @param b  Used with patch replacement; default text color blue color component.
- * @param a  Patch alpha OR default text alpha when used with patch replacement.
  */
-void WI_DrawPatch4(patchid_t patchId, const char* replacement, int x, int y, int alignFlags, int patchFlags, short textFlags, fontid_t fontId, float r, float g, float b, float a);
 void WI_DrawPatch3(patchid_t patchId, const char* replacement, int x, int y, int alignFlags, int patchFlags, short textFlags, fontid_t fontId);
 void WI_DrawPatch2(patchid_t patchId, const char* replacement, int x, int y, int alignFlags, int patchFlags, short textFlags);
 void WI_DrawPatch(patchid_t patchId, const char* replacement, int x, int y);

doomsday/plugins/common/src/hu_lib.c

@@ -1073,10 +1073,14 @@ void MNText_Drawer(mn_object_t* obj, int x, int y)
     {
         float t = (menuFlashCounter <= 50? menuFlashCounter / 50.0f : (100 - menuFlashCounter) / 50.0f);
         color[CR] *= t; color[CG] *= t; color[CB] *= t;
-        color[CR] += cfg.menuTextFlashColor[CR] * (1 - t); color[CG] += cfg.menuTextFlashColor[CG] * (1 - t); color[CB] += cfg.menuTextFlashColor[CB] * (1 - t);
+        color[CR] += cfg.menuTextFlashColor[CR] * (1 - t);
+        color[CG] += cfg.menuTextFlashColor[CG] * (1 - t);
+        color[CB] += cfg.menuTextFlashColor[CB] * (1 - t);
     }
 
     FR_SetFont(fontId);
+    FR_SetColorAndAlphav(color);
+    DGL_Color4f(1, 1, 1, color[CA]);
 
     if(txt->patch != NULL)
     {
@@ -1086,13 +1090,12 @@ void MNText_Drawer(mn_object_t* obj, int x, int y)
             replacement = Hu_ChoosePatchReplacement2(*txt->patch, txt->text, true);
         }
         DGL_Enable(DGL_TEXTURE_2D);
-        WI_DrawPatch4(*txt->patch, replacement, x, y, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), fontId, color[CR], color[CG], color[CB], color[CA]);
+        WI_DrawPatch3(*txt->patch, replacement, x, y, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), fontId);
         DGL_Disable(DGL_TEXTURE_2D);
         return;
     }
 
     DGL_Enable(DGL_TEXTURE_2D);
-    FR_SetColorAndAlphav(color);
     FR_DrawText3(txt->text, x, y, ALIGN_TOPLEFT, MN_MergeMenuEffectWithDrawTextFlags(0));
     DGL_Disable(DGL_TEXTURE_2D);
     }
@@ -1688,6 +1691,10 @@ void MNButton_Drawer(mn_object_t* obj, int x, int y)
         color[CR] += cfg.menuTextFlashColor[CR] * (1 - t); color[CG] += cfg.menuTextFlashColor[CG] * (1 - t); color[CB] += cfg.menuTextFlashColor[CB] * (1 - t);
     }
 
+    FR_SetFont(fontId);
+    FR_SetColorAndAlphav(color);
+    DGL_Color4f(1, 1, 1, color[CA]);
+
     if(btn->patch)
     {
         const char* replacement = NULL;
@@ -1696,17 +1703,13 @@ void MNButton_Drawer(mn_object_t* obj, int x, int y)
             replacement = Hu_ChoosePatchReplacement2(*btn->patch, btn->text, true);
         }
         DGL_Enable(DGL_TEXTURE_2D);
-        WI_DrawPatch4(*btn->patch, replacement, x, y, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), fontId, color[CR], color[CG], color[CB], color[CA]);
+        WI_DrawPatch3(*btn->patch, replacement, x, y, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), fontId);
         DGL_Disable(DGL_TEXTURE_2D);
         return;
     }
 
     DGL_Enable(DGL_TEXTURE_2D);
-    FR_SetFont(fontId);
-    FR_SetColorAndAlphav(color);
-
     FR_DrawText3(btn->text, x, y, ALIGN_TOPLEFT, MN_MergeMenuEffectWithDrawTextFlags(0));
-
     DGL_Disable(DGL_TEXTURE_2D);
     }
 }

doomsday/plugins/common/src/hu_menu.c

@@ -2820,40 +2820,43 @@ int Hu_MenuSelectLoadSlot(mn_object_t* obj, mn_actionid_t action, void* paramate
 
 void Hu_MenuDrawMainPage(mn_page_t* page, int x, int y)
 {
+#if __JDOOM__ || __JDOOM64__
+#  define TITLEOFFSET_X         (-3)
+#  define TITLEOFFSET_Y         (-62)
+#else
+#  define TITLEOFFSET_X         (-22)
+#  define TITLEOFFSET_Y         (-56)
+#endif
+
 #if __JHEXEN__
     int frame = (menuTime / 5) % 7;
+#endif
 
     DGL_Enable(DGL_TEXTURE_2D);
     DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
+    FR_SetColorAndAlpha(1, 1, 1, mnRendState->pageAlpha);
 
-    GL_DrawPatch(pMainTitle, x - 22, y - 56);
+    WI_DrawPatch3(pMainTitle, Hu_ChoosePatchReplacement(pMainTitle), x + TITLEOFFSET_X, y + TITLEOFFSET_Y, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
+#if __JHEXEN__
     GL_DrawPatch(pBullWithFire[(frame + 2) % 7], x - 73, y + 24);
     GL_DrawPatch(pBullWithFire[frame], x + 168, y + 24);
-
-    DGL_Disable(DGL_TEXTURE_2D);
-
 #elif __JHERETIC__
-    DGL_Enable(DGL_TEXTURE_2D);
-
-    WI_DrawPatch4(pMainTitle, Hu_ChoosePatchReplacement(pMainTitle), x - 22, y - 56, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), 1, 1, 1, mnRendState->pageAlpha);
-    DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
     GL_DrawPatch(pRotatingSkull[17 - frame], x - 70, y - 46);
     GL_DrawPatch(pRotatingSkull[frame], x + 122, y - 46);
+#endif
 
     DGL_Disable(DGL_TEXTURE_2D);
-#elif __JDOOM__ || __JDOOM64__
-    DGL_Enable(DGL_TEXTURE_2D);
-    WI_DrawPatch4(pMainTitle, Hu_ChoosePatchReplacement(pMainTitle), x - 3, y - 62, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), 1, 1, 1, mnRendState->pageAlpha);
-    DGL_Disable(DGL_TEXTURE_2D);
-#endif
+
+#undef TITLEOFFSET_Y
+#undef TITLEOFFSET_X
 }
 
 void Hu_MenuDrawGameTypePage(mn_page_t* page, int x, int y)
 {
 #if __JDOOM__ || __JDOOM64__
-#  define TITLEOFFSET_X       (67)
+#  define TITLEOFFSET_X         (67)
 #else
-#  define TITLEOFFSET_X       (60)
+#  define TITLEOFFSET_X         (60)
 #endif
 
     DGL_Enable(DGL_TEXTURE_2D);
@@ -2954,7 +2957,10 @@ void Hu_MenuDrawEpisodePage(mn_page_t* page, int x, int y)
     }
     // kludge end.
 #else // __JDOOM__
-    WI_DrawPatch4(pEpisode, Hu_ChoosePatchReplacement2(pEpisode, "{case}Which Episode{scaley=1.25,y=-3}?", true), x + 7, y - 25, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+    DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
+    FR_SetColorAndAlpha(cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+
+    WI_DrawPatch3(pEpisode, Hu_ChoosePatchReplacement2(pEpisode, "{case}Which Episode{scaley=1.25,y=-3}?", true), x + 7, y - 25, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
 #endif
 
     DGL_Disable(DGL_TEXTURE_2D);
@@ -2964,13 +2970,14 @@ void Hu_MenuDrawEpisodePage(mn_page_t* page, int x, int y)
 void Hu_MenuDrawSkillPage(mn_page_t* page, int x, int y)
 {
     DGL_Enable(DGL_TEXTURE_2D);
+    DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
+    FR_SetFont(FID(GF_FONTB));
+    FR_SetColorAndAlpha(cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
 
 #if __JDOOM__ || __JDOOM64__
-    WI_DrawPatch4(pNewGame, Hu_ChoosePatchReplacement2(pNewGame, "{case}NEW GAME", true), x + 48, y - 49, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
-    WI_DrawPatch4(pSkill, Hu_ChoosePatchReplacement2(pSkill, "{case}Choose Skill Level:", true), x + 6, y - 25, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+    WI_DrawPatch3(pNewGame, Hu_ChoosePatchReplacement2(pNewGame, "{case}NEW GAME", true), x + 48, y - 49, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
+    WI_DrawPatch3(pSkill, Hu_ChoosePatchReplacement2(pSkill, "{case}Choose Skill Level:", true), x + 6, y - 25, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
 #elif __JHEXEN__
-    FR_SetFont(FID(GF_FONTB));
-    FR_SetColorAndAlpha(cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
     FR_DrawText3("Choose Skill Level:", x - 46, y - 28, ALIGN_TOPLEFT, MN_MergeMenuEffectWithDrawTextFlags(0));
 #endif
 
@@ -3233,13 +3240,14 @@ int Hu_MenuCvarColorBox(mn_object_t* obj, mn_actionid_t action, void* paramaters
 void Hu_MenuDrawLoadGamePage(mn_page_t* page, int x, int y)
 {
     DGL_Enable(DGL_TEXTURE_2D);
-
-#if __JHERETIC__ || __JHEXEN__
+    DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
     FR_SetFont(FID(GF_FONTB));
     FR_SetColorAndAlpha(cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+
+#if __JHERETIC__ || __JHEXEN__
     FR_DrawText3("Load Game", SCREENWIDTH/2, y-20, ALIGN_TOP, MN_MergeMenuEffectWithDrawTextFlags(0));
 #else
-    WI_DrawPatch4(pLoadGame, Hu_ChoosePatchReplacement2(pLoadGame, "{case}Load game", true), x - 8, y - 26, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+    WI_DrawPatch3(pLoadGame, Hu_ChoosePatchReplacement2(pLoadGame, "{case}Load game", true), x - 8, y - 26, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
 #endif
 
     DGL_Disable(DGL_TEXTURE_2D);
@@ -3248,13 +3256,14 @@ void Hu_MenuDrawLoadGamePage(mn_page_t* page, int x, int y)
 void Hu_MenuDrawSaveGamePage(mn_page_t* page, int x, int y)
 {
     DGL_Enable(DGL_TEXTURE_2D);
-
-#if __JHERETIC__ || __JHEXEN__
+    DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
     FR_SetFont(FID(GF_FONTB));
     FR_SetColorAndAlpha(cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+
+#if __JHERETIC__ || __JHEXEN__
     FR_DrawText3("Save Game", SCREENWIDTH/2, y-20, ALIGN_TOP, MN_MergeMenuEffectWithDrawTextFlags(0));
 #else
-    WI_DrawPatch4(pSaveGame, Hu_ChoosePatchReplacement2(pSaveGame, "{case}Save game", true), x - 8, y - 26, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+    WI_DrawPatch3(pSaveGame, Hu_ChoosePatchReplacement2(pSaveGame, "{case}Save game", true), x - 8, y - 26, ALIGN_TOPLEFT, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
 #endif
 
     DGL_Disable(DGL_TEXTURE_2D);
@@ -3272,13 +3281,14 @@ int Hu_MenuSelectHelp(mn_object_t* obj, mn_actionid_t action, void* paramaters)
 void Hu_MenuDrawOptionsPage(mn_page_t* page, int x, int y)
 {
     DGL_Enable(DGL_TEXTURE_2D);
-
-#if __JHERETIC__ || __JHEXEN__
+    DGL_Color4f(1, 1, 1, mnRendState->pageAlpha);
     FR_SetFont(FID(GF_FONTB));
     FR_SetColorAndAlpha(cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+
+#if __JHERETIC__ || __JHEXEN__
     FR_DrawText3("OPTIONS", x + 42, y - 38, ALIGN_TOP, MN_MergeMenuEffectWithDrawTextFlags(0));
 #else
-    WI_DrawPatch4(pOptionsTitle, Hu_ChoosePatchReplacement2(pOptionsTitle, "{case}OPTIONS", true), x + 42, y - 20, ALIGN_TOP, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB), cfg.menuTextColors[0][CR], cfg.menuTextColors[0][CG], cfg.menuTextColors[0][CB], mnRendState->pageAlpha);
+    WI_DrawPatch3(pOptionsTitle, Hu_ChoosePatchReplacement2(pOptionsTitle, "{case}OPTIONS", true), x + 42, y - 20, ALIGN_TOP, 0, MN_MergeMenuEffectWithDrawTextFlags(0), FID(GF_FONTB));
 #endif
 
     DGL_Disable(DGL_TEXTURE_2D);

doomsday/plugins/common/src/hu_stuff.c

@@ -1205,16 +1205,15 @@ const char* Hu_ChoosePatchReplacement(patchid_t patchId)
     return Hu_ChoosePatchReplacement2(patchId, NULL, false);
 }
 
-void WI_DrawPatch4(patchid_t patchId, const char* replacement, int x, int y, int alignFlags,
-    int patchFlags, short textFlags, fontid_t fontId, float r, float g, float b, float a)
+void WI_DrawPatch3(patchid_t patchId, const char* replacement, int x, int y, int alignFlags,
+    int patchFlags, short textFlags, fontid_t fontId)
 {
     if(NULL != replacement && replacement[0])
     {
         // Use the replacement string.
         FR_SetFont(fontId);
         FR_SetLeading(.5f);
         FR_SetTracking(0);
-        FR_SetColorAndAlpha(r, g, b, a);
         FR_DrawText3(replacement, x, y, alignFlags, textFlags);
         return;
     }
@@ -1223,16 +1222,9 @@ void WI_DrawPatch4(patchid_t patchId, const char* replacement, int x, int y, int
         return;
 
     // Use the original patch.
-    DGL_Color4f(1, 1, 1, a);
     GL_DrawPatch2(patchId, x, y, alignFlags, patchFlags);
 }
 
-void WI_DrawPatch3(patchid_t patchId, const char* replacement, int x, int y, int alignFlags,
-    int patchFlags, short textFlags, fontid_t fontId)
-{
-    WI_DrawPatch4(patchId, replacement, x, y, alignFlags, patchFlags, textFlags, fontId, 1, 1, 1, 1);
-}
-
 void WI_DrawPatch2(patchid_t patchId, const char* replacement, int x, int y, int alignFlags,
     int patchFlags, short textFlags)
 {
@@ -1509,6 +1501,9 @@ void Hu_Drawer(void)
             DGL_Scalef((float)winWidth/SCREENWIDTH, (float)winWidth/SCREENWIDTH, 1);
 
         DGL_Enable(DGL_TEXTURE_2D);
+        DGL_Color4f(1, 1, 1, 1);
+        FR_SetFont(FID(GF_FONTB));
+        FR_SetColorAndAlpha(1, 1, 1, 1);
 
         WI_DrawPatch3(m_pause, Hu_ChoosePatchReplacement(m_pause), 0, 0, ALIGN_TOP, DPF_NO_OFFSET, 0, FID(GF_FONTB));
 
@@ -1562,6 +1557,13 @@ static void drawMapTitle(void)
         lname = P_GetMapName(gameMap);
 #endif
 
+    DGL_Enable(DGL_TEXTURE_2D);
+    DGL_Color4f(1, 1, 1, alpha);
+
+    FR_SetFont(FID(GF_FONTB));
+    FR_LoadDefaultAttrib();
+    FR_SetColorAndAlpha(defFontRGB[0], defFontRGB[1], defFontRGB[2], alpha);
+
 #if __JDOOM__ || __JDOOM64__
     // Compose the mapnumber used to check the map name patches array.
 # if __JDOOM__
@@ -1572,40 +1574,25 @@ static void drawMapTitle(void)
 # else // __JDOOM64__
     mapnum = gameMap;
 # endif
-
-    DGL_Enable(DGL_TEXTURE_2D);
-
-    FR_LoadDefaultAttrib();
-
-    WI_DrawPatch4(pMapNames[mapnum], Hu_ChoosePatchReplacement2(pMapNames[mapnum], lname, false), 0, 0, ALIGN_TOP, 0, DTF_ONLY_SHADOW, FID(GF_FONTB), 1, 1, 1, alpha);
-
-    DGL_Disable(DGL_TEXTURE_2D);
+    WI_DrawPatch3(pMapNames[mapnum], Hu_ChoosePatchReplacement2(pMapNames[mapnum], lname, false), 0, 0, ALIGN_TOP, 0, DTF_ONLY_SHADOW, FID(GF_FONTB));
 
     y += 14;
 #elif __JHERETIC__ || __JHEXEN__
     if(lname)
     {
-        DGL_Enable(DGL_TEXTURE_2D);
-
-        FR_SetFont(FID(GF_FONTB));
-        FR_SetColorAndAlpha(defFontRGB[0], defFontRGB[1], defFontRGB[2], alpha);
         FR_DrawText3(lname, 0, 0, ALIGN_TOP, DTF_ONLY_SHADOW);
-
-        DGL_Disable(DGL_TEXTURE_2D);
         y += 20;
     }
 #endif
 
     if(lauthor)
     {
-        DGL_Enable(DGL_TEXTURE_2D);
-
         FR_SetFont(FID(GF_FONTA));
         FR_SetColorAndAlpha(.5f, .5f, .5f, alpha);
         FR_DrawText3(lauthor, 0, y, ALIGN_TOP, DTF_ONLY_SHADOW);
-
-        DGL_Disable(DGL_TEXTURE_2D);
     }
+
+    DGL_Disable(DGL_TEXTURE_2D);
 }
 
 void Hu_DrawMapTitle(int x, int y, float scale)

doomsday/plugins/jdoom/src/d_main.c

@@ -69,6 +69,7 @@ gamemode_t gameMode;
 int gameModeBits;
 
 // Default font colours.
+const float defFontRGB[]  = { 1, 1, 1 };
 const float defFontRGB2[] = { .85f, 0, 0 };
 const float defFontRGB3[] = { 1, .9f, .4f };
 

doomsday/plugins/jdoom/src/st_stuff.c

@@ -1472,14 +1472,18 @@ void SBarFace_Drawer(uiwidget_t* obj, int x, int y)
     if(face->faceIndex >= 0)
     {
         patchid_t patchId = pFaces[face->faceIndex].id;
+
         DGL_MatrixMode(DGL_MODELVIEW);
         DGL_PushMatrix();
         DGL_Translatef(x, y, 0);
         DGL_Scalef(cfg.statusbarScale, cfg.statusbarScale, 1);
         DGL_Translatef(0, yOffset, 0);
+
         DGL_Enable(DGL_TEXTURE_2D);
+        DGL_Color4f(1, 1, 1, iconAlpha);
+        FR_SetColorAndAlpha(1, 1, 1, iconAlpha);
 
-        WI_DrawPatch4(patchId, Hu_ChoosePatchReplacement(patchId), ORIGINX+ST_FACESX, ORIGINY+ST_FACESY, ALIGN_TOPLEFT, 0, 0, FID(GF_FONTB), 1, 1, 1, iconAlpha);
+        WI_DrawPatch3(patchId, Hu_ChoosePatchReplacement(patchId), ORIGINX+ST_FACESX, ORIGINY+ST_FACESY, ALIGN_TOPLEFT, 0, 0, FID(GF_FONTB));
 
         DGL_Disable(DGL_TEXTURE_2D);
         DGL_MatrixMode(DGL_MODELVIEW);
@@ -1574,12 +1578,15 @@ void KeySlot_Drawer(uiwidget_t* obj, int x, int y)
     DGL_Translatef(x, y, 0);
     DGL_Scalef(cfg.statusbarScale, cfg.statusbarScale, 1);
     DGL_Translatef(0, yOffset, 0);
+
     DGL_Enable(DGL_TEXTURE_2D);
+    DGL_Color4f(1, 1, 1, iconAlpha);
+    FR_SetColorAndAlpha(1, 1, 1, iconAlpha);
 
-    WI_DrawPatch4(kslt->patchId, Hu_ChoosePatchReplacement(kslt->patchId), loc->x + offset, loc->y + offset, ALIGN_TOPLEFT, 0, 0, FID(GF_FONTB), 1, 1, 1, iconAlpha);
+    WI_DrawPatch3(kslt->patchId, Hu_ChoosePatchReplacement(kslt->patchId), loc->x + offset, loc->y + offset, ALIGN_TOPLEFT, 0, 0, FID(GF_FONTB));
     if(kslt->patchId2 != 0)
     {
-        WI_DrawPatch4(kslt->patchId2, Hu_ChoosePatchReplacement(kslt->patchId2), loc->x - offset, loc->y - offset, ALIGN_TOPLEFT, 0, 0, FID(GF_FONTB), 1, 1, 1, iconAlpha);
+        WI_DrawPatch3(kslt->patchId2, Hu_ChoosePatchReplacement(kslt->patchId2), loc->x - offset, loc->y - offset, ALIGN_TOPLEFT, 0, 0, FID(GF_FONTB));
     }
 
     DGL_Disable(DGL_TEXTURE_2D);
@@ -1710,9 +1717,12 @@ void WeaponSlot_Drawer(uiwidget_t* obj, int x, int y)
     DGL_Translatef(x, y, 0);
     DGL_Scalef(cfg.statusbarScale, cfg.statusbarScale, 1);
     DGL_Translatef(0, yOffset, 0);
+
     DGL_Enable(DGL_TEXTURE_2D);
+    DGL_Color4f(1, 1, 1, textAlpha);
+    FR_SetColorAndAlpha(1, 1, 1, textAlpha);
 
-    WI_DrawPatch4(wpns->patchId, Hu_ChoosePatchReplacement(wpns->patchId), element->x, element->y, ALIGN_TOPLEFT, 0, 0, 0, 1, 1, 1, textAlpha);
+    WI_DrawPatch3(wpns->patchId, Hu_ChoosePatchReplacement(wpns->patchId), element->x, element->y, ALIGN_TOPLEFT, 0, 0, 0);
 
     DGL_Disable(DGL_TEXTURE_2D);
     DGL_MatrixMode(DGL_MODELVIEW);
@@ -2840,9 +2850,12 @@ void MapName_Drawer(uiwidget_t* obj, int x, int y)
     DGL_Scalef(scale, scale, 1);
 
     DGL_Enable(DGL_TEXTURE_2D);
-    WI_DrawPatch4(patch, text, 0, 0, ALIGN_BOTTOMLEFT, 0, DTF_NO_EFFECTS, obj->fontId, cfg.hudColor[0], cfg.hudColor[1], cfg.hudColor[2], textAlpha);
-    DGL_Disable(DGL_TEXTURE_2D);
+    DGL_Color4f(1, 1, 1, textAlpha);
+    FR_SetColorAndAlpha(cfg.hudColor[0], cfg.hudColor[1], cfg.hudColor[2], textAlpha);
 
+    WI_DrawPatch3(patch, text, 0, 0, ALIGN_BOTTOMLEFT, 0, DTF_NO_EFFECTS, obj->fontId);
+
+    DGL_Disable(DGL_TEXTURE_2D);
     DGL_MatrixMode(DGL_MODELVIEW);
     DGL_PopMatrix();
     }