]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Disable r_water_hideplayer while in chase camera view
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Mon, 6 Jan 2014 09:49:47 +0000 (09:49 +0000)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 6 Jan 2014 10:14:27 +0000 (11:14 +0100)
From: Samual Lenks <samual@xonotic.org>

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12039 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=52c7f899aabced8885deb6bbb38a696c707afcd3

gl_rmain.c

index 338950aab2c805b3a621852cebfb6f48b8557685..1ebe76c788c9bf66384b804262d6edcdc8a2a8bd 100644 (file)
@@ -6161,7 +6161,7 @@ static void R_Water_ProcessPlanes(int fbo, rtexture_t *depthtexture, rtexture_t
                                        memset(r_refdef.viewcache.world_pvsbits, 0xFF, r_refdef.scene.worldmodel->brush.num_pvsclusterbytes);
                        }
 
-                       r_fb.water.hideplayer = r_water_hideplayer.integer >= 2;
+                       r_fb.water.hideplayer = ((r_water_hideplayer.integer >= 2) && !chase_active.integer);
                        R_ResetViewRendering3D(p->fbo_reflection, r_fb.water.depthtexture, p->texture_reflection);
                        R_ClearScreen(r_refdef.fogenabled);
                        if(r_water_scissormode.integer & 2)
@@ -6190,7 +6190,7 @@ static void R_Water_ProcessPlanes(int fbo, rtexture_t *depthtexture, rtexture_t
                                        continue; // FIXME the plane then still may get rendered but with broken texture, but it sure won't be visible
                        }
 
-                       r_fb.water.hideplayer = r_water_hideplayer.integer >= 1;
+                       r_fb.water.hideplayer = ((r_water_hideplayer.integer >= 1) && !chase_active.integer);
 
                        r_refdef.view.clipplane = p->plane;
                        VectorNegate(r_refdef.view.clipplane.normal, r_refdef.view.clipplane.normal);