From 580fff84c75aab0ce43183763f501ec0d496575b Mon Sep 17 00:00:00 2001 From: vortex Date: Sat, 24 Apr 2010 18:30:51 +0000 Subject: [PATCH] fix another bug in subtitles parsing (badly parsed negative length) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10102 d7cf8633-e32d-0410-b094-e92efae38249 --- cl_video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cl_video.c b/cl_video.c index 3cd9860d..e7f44cac 100644 --- a/cl_video.c +++ b/cl_video.c @@ -139,7 +139,7 @@ static void LoadSubtitles( clvideo_t *video, const char *subtitlesfile ) if (numsubs > 0) // make true len for prev sub, autofix overlapping subtitles { if (video->subtitle_end[numsubs-1] <= 0) - video->subtitle_end[numsubs-1] = max(video->subtitle_start[numsubs-1], video->subtitle_start[numsubs] - video->subtitle_end[numsubs-1]); + video->subtitle_end[numsubs-1] = max(video->subtitle_start[numsubs-1], video->subtitle_start[numsubs] + video->subtitle_end[numsubs-1]); else video->subtitle_end[numsubs-1] = min(video->subtitle_start[numsubs-1] + video->subtitle_end[numsubs-1], video->subtitle_start[numsubs]); } -- 2.39.2