From: vortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 26 Apr 2010 19:29:19 +0000 (+0000)
Subject: fix a warning
X-Git-Tag: xonotic-v0.1.0preview~544
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2d827143e4c99ea0d37d6a0da078807c1500e5a2;p=xonotic%2Fdarkplaces.git

fix a warning

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10105 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2fb0296199fd9fd94e5cb8437213dfcddca44e4a
---

diff --git a/cl_video.c b/cl_video.c
index e7f44cac..f97bb0a3 100644
--- a/cl_video.c
+++ b/cl_video.c
@@ -96,11 +96,30 @@ static qboolean WakeVideo( clvideo_t * video )
 
 static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile )
 {
-	char *subtitle_text, *data;
+	char *subtitle_text;
+	const char *data;
 	float subtime, sublen;
 	int numsubs = 0;
 
-	subtitle_text = (char *)FS_LoadFile(subtitlesfile, cls.permanentmempool, false, NULL);
+	if (gamemode == GAME_BLOODOMNICIDE)
+	{
+		char overridename[MAX_QPATH];
+		cvar_t *langcvar;
+
+		langcvar = Cvar_FindVar("language");
+		subtitle_text = NULL;
+		if (langcvar)
+		{
+			dpsnprintf(overridename, sizeof(overridename), "script/locale/%s/%s", langcvar->string, subtitlesfile);
+			subtitle_text = (char *)FS_LoadFile(overridename, cls.permanentmempool, false, NULL);
+		}
+		if (!subtitle_text)
+			subtitle_text = (char *)FS_LoadFile(subtitlesfile, cls.permanentmempool, false, NULL);
+	}
+	else
+	{
+		subtitle_text = (char *)FS_LoadFile(subtitlesfile, cls.permanentmempool, false, NULL);
+	}
 	if (!subtitle_text)
 	{
 		Con_DPrintf( "LoadSubtitles: can't open subtitle file '%s'!\n", subtitlesfile );