Scale the video subtitle font with the resolution used.

Warzone2100 · May 13, 2011 · 9597d74 · 9597d74
1 parent 8895d58
commit 9597d74
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/ivis_common/textdraw.h b/lib/ivis_common/textdraw.h
@@ -26,9 +26,10 @@
 
 enum iV_fonts
 {
-    font_regular,
-    font_large,
+	font_regular,
+	font_large,
 	font_small,
+	font_scaled,
 };
 
 #define PIE_TEXT_WHITE				(-1)

diff --git a/lib/ivis_opengl/textdraw.c b/lib/ivis_opengl/textdraw.c
@@ -214,6 +214,11 @@ void iV_SetFont(enum iV_fonts FontID)
 			glcFont(_glcFont_Regular);
 			break;
 
+		case font_scaled:
+			iV_SetTextSize(12.f * pie_GetVideoBufferHeight() / 480.f);
+			glcFont(_glcFont_Regular);
+			break;
+
 		case font_large:
 			iV_SetTextSize(21.f);
 			glcFont(_glcFont_Bold);

diff --git a/src/seqdisp.c b/src/seqdisp.c
@@ -159,7 +159,7 @@ bool seq_RenderVideoToBuffer(const char* sequenceName, int seqCommand)
 	{
 		//start the ball rolling
 
-		iV_SetFont(font_regular);
+		iV_SetFont(font_scaled);
 		iV_SetTextColour(WZCOL_TEXT_BRIGHT);
 
 		/* We do *NOT* want to use the user-choosen resolution when we
@@ -248,7 +248,7 @@ static bool seq_StartFullScreenVideo(const char* videoName, const char* audioNam
 	}
 
 	cdAudio_Pause();
-	iV_SetFont(font_regular);
+	iV_SetFont(font_scaled);
 	iV_SetTextColour(WZCOL_TEXT_BRIGHT);
 
 	/* We do not want to enter loop_SetVideoPlaybackMode() when we are
@@ -262,7 +262,7 @@ static bool seq_StartFullScreenVideo(const char* videoName, const char* audioNam
 			// check to see if we need to pause, and set font each time
 			cdAudio_Pause();
 			loop_SetVideoPlaybackMode();
-			iV_SetFont(font_regular);
+			iV_SetFont(font_scaled);
 			iV_SetTextColour(WZCOL_TEXT_BRIGHT);
 		}
 
@@ -478,7 +478,7 @@ BOOL seq_AddTextForVideo(const char* pText, SDWORD xOffset, SDWORD yOffset, SDWO
 	// make sure we take xOffset into account, we don't always start at 0
 	const unsigned int BUFFER_WIDTH = pie_GetVideoBufferWidth() - xOffset;
 
-	iV_SetFont(font_regular);
+	iV_SetFont(font_scaled);
 
 	ASSERT(aSeqList[currentSeq].currentText < MAX_TEXT_OVERLAYS, "too many text lines");