Remaster merge commit '55186404'

src/client/cl_screen.c

@@ -458,7 +458,7 @@ SCR_DrawNet(void)
 		return;
 	}
 
-	Draw_PicScaled(scr_vrect.x + 64 * scale, scr_vrect.y, "net", scale);
+	Draw_PicScaledAltText(scr_vrect.x + 64 * scale, scr_vrect.y, "net", scale, "net");
 }
 
 void
@@ -478,7 +478,8 @@ SCR_DrawPause(void)
 	}
 
 	Draw_GetPicSize(&w, &h, "pause");
-	Draw_PicScaled((viddef.width - w * scale) / 2, viddef.height / 2 + 8 * scale, "pause", scale);
+	Draw_PicScaledAltText((viddef.width - w * scale) / 2, viddef.height / 2 + 8 * scale,
+		"pause", scale, "pause");
 }
 
 void
@@ -493,7 +494,8 @@ SCR_DrawLoading(void)
 	}
 
 	Draw_GetPicSize(&w, &h, "loading");
-	Draw_PicScaled((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2, "loading", scale);
+	Draw_PicScaledAltText((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2,
+		"loading", scale, "loading");
 }
 
 /*
@@ -1000,6 +1002,9 @@ SCR_DrawFieldScaled(int x, int y, int color, int width, int value, float factor)
 
 	while (*ptr && l)
 	{
+		char alttext[] = "?";
+
+		alttext[0] = *ptr;
 		if (*ptr == '-')
 		{
 			frame = STAT_MINUS;
@@ -1010,8 +1015,8 @@ SCR_DrawFieldScaled(int x, int y, int color, int width, int value, float factor)
 			frame = *ptr - '0';
 		}
 
-		Draw_PicScaled(x, y, sb_nums[color][frame], factor);
-		x += CHAR_WIDTH*factor;
+		Draw_PicScaledAltText(x, y, sb_nums[color][frame], factor, alttext);
+		x += CHAR_WIDTH * factor;
 		ptr++;
 		l--;
 	}
@@ -1309,20 +1314,24 @@ SCR_ExecuteLayoutString(char *s)
 
 			if ((index < 0) || (index >= MAX_STATS))
 			{
-				Com_Error(ERR_DROP, "bad stats index %d (0x%x)", index, index);
+				Com_DPrintf("%s: bad stats index %d (0x%x)",
+					__func__, index, index);
+				continue;
 			}
 
 			value = cl.frame.playerstate.stats[index];
 
 			if (value >= MAX_IMAGES)
 			{
-				Com_Error(ERR_DROP, "Pic >= MAX_IMAGES");
+				Com_DPrintf("%s: Pic %d >= MAX_IMAGES",
+					__func__, value);
+				continue;
 			}
 
 			if (cl.configstrings[CS_IMAGES + value][0] != '\0')
 			{
 				SCR_AddDirtyPoint(x, y);
-				SCR_AddDirtyPoint(x + 23*scale, y + 23*scale);
+				SCR_AddDirtyPoint(x + 23 * scale, y + 23 * scale);
 				Draw_PicScaled(x, y, cl.configstrings[CS_IMAGES + value], scale);
 			}
 
@@ -1842,7 +1851,8 @@ SCR_UpdateScreen(void)
 			}
 
 			Draw_GetPicSize(&w, &h, "loading");
-			Draw_PicScaled((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2, "loading", scale);
+			Draw_PicScaledAltText((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2,
+				"loading", scale, "loading");
 		}
 
 		/* if a cinematic is supposed to be running,

src/client/menu/header/qmenu.h

@@ -91,6 +91,7 @@ typedef struct
 	menucommon_s    generic;
 	char *          focuspic;
 	char *          errorpic;
+	char *          alttext;
 	int             width;
 	int             height;
 } menubitmap_s;

src/client/menu/menu.c

@@ -462,7 +462,7 @@ M_DrawCursor(int x, int y, int f)
 	}
 
 	Com_sprintf(cursorname, sizeof(cursorname), "m_cursor%d", f);
-	Draw_PicScaled(x * scale, y * scale, cursorname, scale);
+	Draw_PicScaledAltText(x * scale, y * scale, cursorname, scale, "*");
 }
 
 static void
@@ -665,6 +665,7 @@ InitMainMenu(void)
 	s_plaque.generic.name = "m_main_plaque";
 	s_plaque.generic.callback = 0;
 	s_plaque.focuspic = 0;
+	s_plaque.alttext = NULL;
 
 	s_logo.generic.type = MTYPE_BITMAP;
 	s_logo.generic.flags = QMF_LEFT_JUSTIFY | QMF_INACTIVE;
@@ -673,6 +674,7 @@ InitMainMenu(void)
 	s_logo.generic.name = "m_main_logo";
 	s_logo.generic.callback = 0;
 	s_logo.focuspic = 0;
+	s_logo.alttext = NULL;
 
 	y += 10;
 
@@ -683,6 +685,7 @@ InitMainMenu(void)
 	s_game.generic.name = "m_main_game";
 	s_game.generic.callback = GameFunc;
 	s_game.focuspic = "m_main_game_sel";
+	s_game.alttext = "Game";
 
 	Draw_GetPicSize(&w, &h, ( char * )s_game.generic.name);
 	y += h + 8;
@@ -694,6 +697,7 @@ InitMainMenu(void)
 	s_multiplayer.generic.name = "m_main_multiplayer";
 	s_multiplayer.generic.callback = MultiplayerFunc;
 	s_multiplayer.focuspic = "m_main_multiplayer_sel";
+	s_multiplayer.alttext = "Multiplayer";
 
 	Draw_GetPicSize(&w, &h, ( char * )s_multiplayer.generic.name);
 	y += h + 8;
@@ -705,6 +709,7 @@ InitMainMenu(void)
 	s_options.generic.name = "m_main_options";
 	s_options.generic.callback = OptionsFunc;
 	s_options.focuspic = "m_main_options_sel";
+	s_options.alttext = "Options";
 
 	Draw_GetPicSize(&w, &h, ( char * )s_options.generic.name);
 	y += h + 8;
@@ -716,6 +721,7 @@ InitMainMenu(void)
 	s_video.generic.name = "m_main_video";
 	s_video.generic.callback = VideoFunc;
 	s_video.focuspic = "m_main_video_sel";
+	s_video.alttext = "Video";
 
 	Draw_GetPicSize(&w, &h, ( char * )s_video.generic.name);
 	y += h + 8;
@@ -727,6 +733,7 @@ InitMainMenu(void)
 	s_quit.generic.name = "m_main_quit";
 	s_quit.generic.callback = QuitFunc;
 	s_quit.focuspic = "m_main_quit_sel";
+	s_quit.alttext = "Quit";
 
 	Menu_AddItem(&s_main, (void *)&s_plaque);
 	Menu_AddItem(&s_main, (void *)&s_logo);
@@ -6377,7 +6384,8 @@ M_Quit_Draw(void)
 	float scale = SCR_GetMenuScale();
 
 	Draw_GetPicSize(&w, &h, "quit");
-	Draw_PicScaled((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2, "quit", scale);
+	Draw_PicScaledAltText((viddef.width - w * scale) / 2, (viddef.height - h * scale) / 2,
+		"quit", scale, "Quit Y/N?");
 }
 
 static void
@@ -6441,6 +6449,12 @@ M_Init(void)
 		{
 			m_cursor_width = w;
 		}
+
+		/* No cursor image? */
+		if (m_cursor_width == 0)
+		{
+			m_cursor_width = 8;
+		}
 	}
 }
 

src/client/menu/qmenu.c

@@ -79,11 +79,13 @@ void Bitmap_Draw(menubitmap_s * item)
 	if (((item->generic.flags & QMF_HIGHLIGHT_IF_FOCUS) &&
 		(Menu_ItemAtCursor(item->generic.parent) == item)))
 	{
-		Draw_PicScaled(x * scale, y * scale, item->focuspic, scale);
+		Draw_PicScaledAltText(x * scale, y * scale, item->focuspic, scale,
+			item->alttext);
 	}
 	else if (item->generic.name)
 	{
-		Draw_PicScaled(x * scale, y * scale, ( char * )item->generic.name, scale);
+		Draw_PicScaledAltText(x * scale, y * scale, ( char * )item->generic.name, scale,
+			item->alttext);
 	}
 }
 

src/client/refresh/gl1/gl1_draw.c

@@ -165,14 +165,28 @@ RDraw_StretchPic(int x, int y, int w, int h, const char *pic)
 }
 
 void
-RDraw_PicScaled(int x, int y, const char *pic, float factor)
+RDraw_PicScaled(int x, int y, const char *pic, float factor, const char *alttext)
 {
 	image_t *gl;
 
 	gl = R_FindPic(pic, (findimage_t)R_FindImage);
 
 	if (!gl)
 	{
+		if (alttext && alttext[0])
+		{
+			/* Show alttext if provided */
+			int l, i;
+
+			l = strlen(alttext);
+			for (i = 0; i < l; i++)
+			{
+				RDraw_CharScaled(x + i * 8 * factor, y, alttext[i], factor);
+			}
+
+			return;
+		}
+
 		R_Printf(PRINT_ALL, "Can't find pic: %s\n", pic);
 		return;
 	}

src/client/refresh/gl1/header/local.h

@@ -484,7 +484,7 @@ int RI_GetSDLVersion();
 /* g11_draw */
 extern image_t * RDraw_FindPic(const char *name);
 extern void RDraw_GetPicSize(int *w, int *h, const char *pic);
-extern void RDraw_PicScaled(int x, int y, const char *pic, float factor);
+extern void RDraw_PicScaled(int x, int y, const char *pic, float factor, const char *alttext);
 extern void RDraw_StretchPic(int x, int y, int w, int h, const char *pic);
 extern void RDraw_CharScaled(int x, int y, int num, float scale);
 extern void RDraw_TileClear(int x, int y, int w, int h, const char *pic);

src/client/refresh/gl3/gl3_draw.c

@@ -214,11 +214,27 @@ GL3_Draw_StretchPic(int x, int y, int w, int h, const char *pic)
 }
 
 void
-GL3_Draw_PicScaled(int x, int y, const char *pic, float factor)
+GL3_Draw_PicScaled(int x, int y, const char *pic, float factor, const char *alttext)
 {
-	gl3image_t *gl = R_FindPic(pic, (findimage_t)GL3_FindImage);
+	gl3image_t *gl;
+
+	gl = R_FindPic(pic, (findimage_t)GL3_FindImage);
 	if (!gl)
 	{
+		if (alttext && alttext[0])
+		{
+			/* Show alttext if provided */
+			int l, i;
+
+			l = strlen(alttext);
+			for (i = 0; i < l; i++)
+			{
+				GL3_Draw_CharScaled(x + i * 8 * factor, y, alttext[i], factor);
+			}
+
+			return;
+		}
+
 		R_Printf(PRINT_ALL, "Can't find pic: %s\n", pic);
 		return;
 	}

src/client/refresh/gl3/header/local.h

@@ -417,7 +417,7 @@ extern void GL3_Draw_ShutdownLocal(void);
 extern gl3image_t * GL3_Draw_FindPic(const char *name);
 extern void GL3_Draw_GetPicSize(int *w, int *h, const char *pic);
 
-extern void GL3_Draw_PicScaled(int x, int y, const char *pic, float factor);
+extern void GL3_Draw_PicScaled(int x, int y, const char *pic, float factor, const char *alttext);
 extern void GL3_Draw_StretchPic(int x, int y, int w, int h, const char *pic);
 extern void GL3_Draw_CharScaled(int x, int y, int num, float scale);
 extern void GL3_Draw_TileClear(int x, int y, int w, int h, const char *pic);

src/client/refresh/gl4/gl4_draw.c

@@ -214,11 +214,25 @@ GL4_Draw_StretchPic(int x, int y, int w, int h, const char *pic)
 }
 
 void
-GL4_Draw_PicScaled(int x, int y, const char *pic, float factor)
+GL4_Draw_PicScaled(int x, int y, const char *pic, float factor, const char *alttext)
 {
 	gl4image_t *gl = R_FindPic(pic, (findimage_t)GL4_FindImage);
 	if (!gl)
 	{
+		if (alttext && alttext[0])
+		{
+			/* Show alttext if provided */
+			int l, i;
+
+			l = strlen(alttext);
+			for (i = 0; i < l; i++)
+			{
+				GL4_Draw_CharScaled(x + i * 8 * factor, y, alttext[i], factor);
+			}
+
+			return;
+		}
+
 		R_Printf(PRINT_ALL, "Can't find pic: %s\n", pic);
 		return;
 	}

src/client/refresh/gl4/header/local.h

@@ -407,7 +407,7 @@ extern void GL4_Draw_ShutdownLocal(void);
 extern gl4image_t * GL4_Draw_FindPic(const char *name);
 extern void GL4_Draw_GetPicSize(int *w, int *h, const char *pic);
 
-extern void GL4_Draw_PicScaled(int x, int y, const char *pic, float factor);
+extern void GL4_Draw_PicScaled(int x, int y, const char *pic, float factor, const char *alttext);
 extern void GL4_Draw_StretchPic(int x, int y, int w, int h, const char *pic);
 extern void GL4_Draw_CharScaled(int x, int y, int num, float scale);
 extern void GL4_Draw_TileClear(int x, int y, int w, int h, const char *pic);

src/client/refresh/soft/header/local.h

@@ -553,7 +553,7 @@ void	RE_EndRegistration (void);
 struct image_s	*RE_Draw_FindPic (const char *name);
 
 void	RE_Draw_GetPicSize (int *w, int *h, const char *name);
-void	RE_Draw_PicScaled (int x, int y, const char *name, float scale);
+void	RE_Draw_PicScaled (int x, int y, const char *name, float scale, const char *alttext);
 void	RE_Draw_StretchPic (int x, int y, int w, int h, const char *name);
 void	RE_Draw_StretchRaw (int x, int y, int w, int h, int cols, int rows, const byte *data, int bits);
 void	RE_Draw_CharScaled (int x, int y, int c, float scale);

src/client/refresh/soft/sw_draw.c

@@ -397,13 +397,27 @@ Draw_Pic
 =============
 */
 void
-RE_Draw_PicScaled(int x, int y, const char *name, float scale)
+RE_Draw_PicScaled(int x, int y, const char *name, float scale, const char *alttext)
 {
 	const image_t *pic;
 
 	pic = R_FindPic (name, (findimage_t)R_FindImage);
 	if (!pic)
 	{
+		if (alttext && alttext[0])
+		{
+			/* Show alttext if provided */
+			int l, i;
+
+			l = strlen(alttext);
+			for (i = 0; i < l; i++)
+			{
+				RE_Draw_CharScaled(x + i * 8 * scale, y, alttext[i], scale);
+			}
+
+			return;
+		}
+
 		R_Printf(PRINT_ALL, "Can't find pic: %s\n", name);
 		return;
 	}

src/client/refresh/vk/header/local.h

@@ -206,7 +206,7 @@ void R_DrawSkyBox(void);
 struct image_s	*RE_Draw_FindPic (const char *name);
 
 void	RE_Draw_GetPicSize (int *w, int *h, const char *name);
-void	RE_Draw_PicScaled (int x, int y, const char *name, float scale);
+void	RE_Draw_PicScaled (int x, int y, const char *name, float scale, const char *alttext);
 void	RE_Draw_StretchPic (int x, int y, int w, int h, const char *name);
 void	RE_Draw_CharScaled (int x, int y, int num, float scale);
 void	RE_Draw_TileClear (int x, int y, int w, int h, const char *name);

src/client/refresh/vk/vk_draw.c

@@ -151,13 +151,27 @@ void RE_Draw_StretchPic (int x, int y, int w, int h, const char *name)
 RE_Draw_PicScaled
 =============
 */
-void RE_Draw_PicScaled (int x, int y, const char *name, float scale)
+void RE_Draw_PicScaled (int x, int y, const char *name, float scale, const char *alttext)
 {
 	image_t *vk;
 
 	vk = R_FindPic(name, (findimage_t)Vk_FindImage);
 	if (!vk)
 	{
+		if (alttext && alttext[0])
+		{
+			/* Show alttext if provided */
+			int l, i;
+
+			l = strlen(alttext);
+			for (i = 0; i < l; i++)
+			{
+				RE_Draw_CharScaled(x + i * 8 * scale, y, alttext[i], scale);
+			}
+
+			return;
+		}
+
 		R_Printf(PRINT_ALL, "%s(): Can't find pic: %s\n", __func__, name);
 		return;
 	}