From cc41c5793edfcefef02a18d6a52355f67ea0de65 Mon Sep 17 00:00:00 2001 From: leilei- Date: Sat, 20 Aug 2016 16:53:55 -0400 Subject: [PATCH] - Quick fix to widescreen expansion code so it won't mess with interface refdefs anymore (the old menu logo should be at normal size now, for example) - Don't build opengl1 and softwaare as those are either obsolete or don't make a difference and would only serve to confuse --- Makefile | 8 ++++---- code/renderer_oa/tr_scene.c | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 2014258a..ec86aaa9 100644 --- a/Makefile +++ b/Makefile @@ -964,15 +964,15 @@ endif ifneq ($(BUILD_CLIENT),0) ifneq ($(USE_RENDERER_DLOPEN),0) TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) $(B)/renderer_openarena1_$(SHLIBNAME) - TARGETS += $(B)/renderer_opengl1_$(SHLIBNAME) - TARGETS += $(B)/renderer_software_$(SHLIBNAME) +# TARGETS += $(B)/renderer_opengl1_$(SHLIBNAME) +# TARGETS += $(B)/renderer_software_$(SHLIBNAME) ifneq ($(BUILD_RENDERER_OPENGL2), 0) TARGETS += $(B)/renderer_opengl2_$(SHLIBNAME) endif else TARGETS += $(B)/$(CLIENTBIN)$(FULLBINEXT) - TARGETS += $(B)/$(CLIENTBIN)_opengl1$(FULLBINEXT) - TARGETS += $(B)/$(CLIENTBIN)_software$(FULLBINEXT) +# TARGETS += $(B)/$(CLIENTBIN)_opengl1$(FULLBINEXT) +# TARGETS += $(B)/$(CLIENTBIN)_software$(FULLBINEXT) ifneq ($(BUILD_RENDERER_OPENGL2), 0) TARGETS += $(B)/$(CLIENTBIN)_opengl2$(FULLBINEXT) endif diff --git a/code/renderer_oa/tr_scene.c b/code/renderer_oa/tr_scene.c index 872c5c6c..b05578ca 100644 --- a/code/renderer_oa/tr_scene.c +++ b/code/renderer_oa/tr_scene.c @@ -392,6 +392,7 @@ void RE_RenderScene( const refdef_t *fd ) { // leilei - widescreen // recalculate fov according to widescreen parameters + if (!( fd->rdflags & RDF_NOWORLDMODEL ) ) // don't affect interface refdefs { float zoomfov = tr.refdef.fov_x / 90; // figure out our zoom or changed fov magnitiude from cg_fov and cg_zoomfov int thisisit;