X-Git-Url: https://harrygodden.com/git/?p=csRadar.git;a=blobdiff_plain;f=csrDraw.h;fp=csrDraw.h;h=14c91c23fd1f1504902f5eeb1f7429239a7e84d2;hp=29189a1e9cfd16cc21e10dc6d5367cdcc9627845;hb=a53095e1511fecb8cc83c692e7ce7b23852fff16;hpb=1d2752b69b6285d5eb6436728c6cf84228a9ccde

diff --git a/csrDraw.h b/csrDraw.h
index 29189a1..14c91c2 100644
--- a/csrDraw.h
+++ b/csrDraw.h
@@ -81,18 +81,17 @@ void csr_auto_fit( csr_target *rt, float padding )
 	dx = rt->bounds[1][0] - rt->bounds[0][0];
 	dy = rt->bounds[1][1] - rt->bounds[0][1];
 	
-	l = fmaxf( dx, dy );
-	d = l * ( l / dx ) * .5f;
+	l = fmaxf( dx, dy ) * .5f;
 		
 	cx = (rt->bounds[1][0] + rt->bounds[0][0]) * .5f;
 	cy = (rt->bounds[1][1] + rt->bounds[0][1]) * .5f;
 
-	rt->bounds[0][0] = cx - d - padding;
-	rt->bounds[1][0] = cx + d + padding;
-	rt->bounds[0][1] = cy - d - padding;
-	rt->bounds[1][1] = cy + d + padding;
+	rt->bounds[0][0] = cx - l - padding;
+	rt->bounds[1][0] = cx + l + padding;
+	rt->bounds[0][1] = cy - l - padding;
+	rt->bounds[1][1] = cy + l + padding;
 	
-	rt->scale = d + padding;
+	rt->scale = l + padding;
 	
 	csr_update_subsamples( rt );
 }
@@ -225,7 +224,6 @@ void draw_vmf_group( csr_target *rt, vmf_map *map, vdf_node *root, csr_filter *f
 	m4x3f transform = M4X3_IDENTITY;
 	vmf_solid solid;
 	vmf_vert tri[3];
-	vdf_node *ent_solid;
 	boxf trf_bounds;
 
 	u32 group_id = 0;
@@ -326,7 +324,7 @@ void draw_vmf_group( csr_target *rt, vmf_map *map, vdf_node *root, csr_filter *f
 		else
 		{
 			// Brush entity
-			if( (ent_solid = vdf_next( ent, "solid", NULL )) )
+			vdf_foreach( ent, "solid", ent_solid )
 			{
 				solidgen_push( &solid, ent_solid );
 			}