From 57de01eb864e816b7dd2022501a40cc9ff629dcc Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@users.sf.net>
Date: Sun, 23 Nov 2008 23:49:15 +0000
Subject: [PATCH] Subtitles have their own message function.

---
 src/drawing.cpp | 18 ++++++++++++++++++
 src/movie.cpp   | 27 ++++++++++++++++++++++++++-
 src/movie.h     |  1 +
 src/video.cpp   |  1 +
 src/video.h     |  3 ++-
 5 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/src/drawing.cpp b/src/drawing.cpp
index 5528b355..37ea02a2 100644
--- a/src/drawing.cpp
+++ b/src/drawing.cpp
@@ -159,6 +159,24 @@ void DrawMessage(bool beforeMovie)
 			DrawTextTrans(ClipSidesOffset+t, 256, (uint8 *)guiMessage.errmsg, color+0x80);
 		}
 	}
+
+	if(subtitleMessage.howlong)
+	{
+		uint8 *tt;
+		subtitleMessage.howlong--;
+		tt=XBuf+FCEU_TextScanlineOffsetFromBottom(216);
+
+		if(tt>=XBuf)
+		{
+			int color = 0x20;
+			if(subtitleMessage.howlong == 39) color = 0x38;
+			if(subtitleMessage.howlong <= 30) color = 0x2C;
+			if(subtitleMessage.howlong <= 20) color = 0x1C;
+			if(subtitleMessage.howlong <= 10) color = 0x11;
+			if(subtitleMessage.howlong <= 5) color = 0x1;
+			DrawTextTrans(ClipSidesOffset+tt, 256, (uint8 *)subtitleMessage.errmsg, color+0x80);
+		}
+	}
 }
 
 
diff --git a/src/movie.cpp b/src/movie.cpp
index 15edbcc4..122e35c7 100644
--- a/src/movie.cpp
+++ b/src/movie.cpp
@@ -1216,6 +1216,31 @@ void ProcessSubtitles(void)
 	for(uint32 i=0;i<currMovieData.subtitles.size();i++)
 	{
 		if (currFrameCounter == subtitleFrames[i])
-			FCEUI_DispMessage("%s",subtitleMessages[i].c_str());
+			FCEU_DisplaySubtitles("%s",subtitleMessages[i].c_str());
+			//FCEUI_DispMessage("%s",subtitleMessages[i].c_str());
 	}
+}
+
+void FCEU_DisplaySubtitles(char *format, ...)
+{
+	/*
+	uint8 color;
+	
+	//color = 0x19+0x80;         //else display green
+	color = 0x20+0x80;
+
+	char counterbuf[512] = {0};	
+	sprintf(counterbuf,"%d",format);
+		
+	if(counterbuf[0])
+		DrawTextTrans(ClipSidesOffset+XBuf+FCEU_TextScanlineOffsetFromBottom(128), 256, (uint8*)counterbuf, color); //0x20+0x80
+		*/
+	va_list ap;
+
+	va_start(ap,format);
+	vsnprintf(subtitleMessage.errmsg,sizeof(subtitleMessage.errmsg),format,ap);
+	va_end(ap);
+
+	subtitleMessage.howlong = 300;
+	subtitleMessage.isMovieMessage = false;
 }
\ No newline at end of file
diff --git a/src/movie.h b/src/movie.h
index ab538ac7..b23cb232 100644
--- a/src/movie.h
+++ b/src/movie.h
@@ -247,6 +247,7 @@ void FCEUI_ToggleInputDisplay(void);
 
 void LoadSubtitles(void);
 void ProcessSubtitles(void);
+void FCEU_DisplaySubtitles(char *format, ...);
 
 
 
diff --git a/src/video.cpp b/src/video.cpp
index 581850f5..5925bdfa 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -60,6 +60,7 @@ int ClipSidesOffset=0;	//Used to move displayed messages when Clips left and rig
 static uint8 *xbsave=NULL;
 
 GUIMESSAGE guiMessage;
+GUIMESSAGE subtitleMessage;
 
 //for input display
 extern int input_display;
diff --git a/src/video.h b/src/video.h
index cde5c5ba..8d5a71dd 100644
--- a/src/video.h
+++ b/src/video.h
@@ -10,12 +10,13 @@ extern struct GUIMESSAGE
 	int howlong;
 
 	//the current gui message
-	char errmsg[86];
+	char errmsg[110];
 
 	//indicates that the movie should be drawn even on top of movies
 	bool isMovieMessage;
 
 } guiMessage;
 
+extern GUIMESSAGE subtitleMessage;
 
 void FCEU_DrawNumberRow(uint8 *XBuf, int *nstatus, int cur);