From 9d10c167b68119df3359dc7d3ace13f818fc6800 Mon Sep 17 00:00:00 2001
From: Spoike <acceptthis@users.sourceforge.net>
Date: Tue, 10 Dec 2013 20:53:31 +0000
Subject: [PATCH] fix a couple of inconsistencies.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4565 fc73d0e0-1445-4013-8a0c-d673dee63da5
---
 engine/client/r_surf.c   | 2 +-
 engine/client/renderer.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/engine/client/r_surf.c b/engine/client/r_surf.c
index 74b8b7032..ae69466a8 100644
--- a/engine/client/r_surf.c
+++ b/engine/client/r_surf.c
@@ -2262,7 +2262,7 @@ void Surf_DrawWorld (void)
 				CM_WriteAreaBits(cl.worldmodel, areabits, clientarea);
 			}
 #ifdef Q3BSPS
-			if (currententity->model->fromgame == fg_quake3)
+			if (cl.worldmodel->fromgame == fg_quake3)
 			{
 				entvis = surfvis = R_MarkLeaves_Q3 ();
 				Surf_RecursiveQ3WorldNode (cl.worldmodel->nodes, (1<<r_refdef.frustum_numplanes)-1);
diff --git a/engine/client/renderer.c b/engine/client/renderer.c
index 69ffd3456..bdf4221dd 100644
--- a/engine/client/renderer.c
+++ b/engine/client/renderer.c
@@ -1805,6 +1805,7 @@ qbyte *R_MarkLeaves_Q3 (void)
 
 	if (r_novis.ival || r_viewcluster == -1 || !cl.worldmodel->vis )
 	{
+		vis = NULL;
 		// mark everything
 		for (i=0,leaf=cl.worldmodel->leafs ; i<cl.worldmodel->numleafs ; i++, leaf++)
 		{