From: Samual Lenks <samual@xonotic.org>
Date: Thu, 26 Dec 2013 08:11:34 +0000 (-0500)
Subject: Clean up debug stuff
X-Git-Tag: xonotic-v0.8.0~247^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=92f0836a539df34826eb33761a9e5a2bc111570e;p=xonotic%2Fxonotic-data.pk3dir.git

Clean up debug stuff
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 1c69e121a..13cae012d 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -142,8 +142,7 @@ set rpn_linear_to_sRGB "dup 1.0 2.4 div pow 1.055 mul 0.055 sub exch 12.92 mul d
 alias skybox_nosRGB_to_sRGB "rpn $3 402.123 $4 div div $rpn_sRGB_to_linear 402.123 $4 div mul /new_skylight: $3 402.123 $4 div div $1 256 div $2 0.017453 mul sin mul add $rpn_sRGB_to_linear $3 402.123 $4 div div $rpn_sRGB_to_linear sub 256 mul $2 0.017453 mul sin div /new_sunlight:"
 
 set cl_orthoview 0 "WARNING: WILL BREAK CONFIG!!! enable top-down view of the map- meant to be used for radar map images"
-set cl_orthoview_nofog 1 "disable fog while in orthoview"
-set cl_orthoview_distanceoverride 0 "set to a value other than 0 to force a different distance offset when in orthoview"
+set cl_orthoview_nofog 1 "disable fog while in orthoview-- note, should not be enabled on ALL maps, i.e. oilrig works fine with this disabled"
 
 // these settings determine how much the view is affected by movement/damage
 cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 4a22c30ae..b5a6dae72 100644
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -573,7 +573,7 @@ void CSQC_UpdateView(float w, float h)
 		float ov_width = (ov_worldmax_x - ov_worldmin_x);
 		float ov_height = (ov_worldmax_y - ov_worldmin_y);
 		float ov_distance = (512 * max(ov_width, ov_height));
-		if(autocvar_cl_orthoview_distanceoverride) { ov_distance = autocvar_cl_orthoview_distanceoverride; }
+		//if(autocvar_cl_orthoview_distanceoverride) { ov_distance = autocvar_cl_orthoview_distanceoverride; }
 		ov_mid = ((ov_worldmax + ov_worldmin) * 0.5);
 		ov_org = FL2VEC(ov_mid_x, ov_mid_y, (ov_mid_z + ov_distance));
 
@@ -603,15 +603,14 @@ void CSQC_UpdateView(float w, float h)
 		setproperty(VF_ORIGIN, ov_org);
 		setproperty(VF_ANGLES, '90 0 0');
 
-		/*if(autocvar_cl_orthoview_debug)
-		{
-			print(sprintf("OrthoView: org = %s, angles = %s, distance = %f, nearest = %f, furthest = %f\n",
-				vtos(ov_org),
-				vtos(getpropertyvec(VF_ANGLES)),
-				ov_distance,
-				ov_nearest,
-				ov_furthest));
-		}*/
+		#if 0
+		print(sprintf("OrthoView: org = %s, angles = %s, distance = %f, nearest = %f, furthest = %f\n",
+			vtos(ov_org),
+			vtos(getpropertyvec(VF_ANGLES)),
+			ov_distance,
+			ov_nearest,
+			ov_furthest));
+		#endif
 	}
 
 	// Render the Scene
diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 5ea1a6526..43aab6ae4 100644
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -56,7 +56,6 @@ float autocvar_cl_lockview;
 float autocvar_cl_nogibs;
 float autocvar_cl_orthoview;
 float autocvar_cl_orthoview_nofog;
-float autocvar_cl_orthoview_distanceoverride;
 float autocvar_cl_particlegibs;
 float autocvar_cl_particles_oldnexbeam;
 float autocvar_cl_particles_quality;