From e120f49e660aab5420e6acb3a5131992645f39c3 Mon Sep 17 00:00:00 2001 From: sago007 Date: Sat, 16 Jun 2018 17:14:50 +0200 Subject: [PATCH] Fix duplicate symbol tvinterlace --- code/renderer_oa/tr_bloom.c | 2 +- code/sdl/sdl_glimp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/renderer_oa/tr_bloom.c b/code/renderer_oa/tr_bloom.c index a951c9f7..e359e90b 100644 --- a/code/renderer_oa/tr_bloom.c +++ b/code/renderer_oa/tr_bloom.c @@ -141,7 +141,7 @@ int leifxmode; int leifxpass; int fakeit = 0; -int tvinterlace = 1; +extern int tvinterlace; int tvinter= 1; extern int tvWidth; extern int tvHeight; diff --git a/code/sdl/sdl_glimp.c b/code/sdl/sdl_glimp.c index 660a680f..a931e819 100644 --- a/code/sdl/sdl_glimp.c +++ b/code/sdl/sdl_glimp.c @@ -52,7 +52,7 @@ static QGLContext opengl_context; int tvMode; // leilei - tvmode int tvWidth; int tvHeight; -int tvinterlace; // leilei - interlace value for height +int tvinterlace = 1; // leilei - interlace value for height float tvAspectW; // leilei - for aspect correction //int vresWidth;