From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Mon, 13 Apr 2009 19:51:54 +0000 (+0000)
Subject: fix two msvc compile errors
X-Git-Tag: svn-r421~101
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68a9e95faf85e198b9b1b64ca2f25d166334e605;p=xonotic%2Fnetradiant.git

fix two msvc compile errors


git-svn-id: svn://svn.icculus.org/netradiant/trunk@319 61c419a2-8eb2-4b30-bcec-8cead039b335
---

diff --git a/tools/quake3/q3map2/facebsp.c b/tools/quake3/q3map2/facebsp.c
index 702765ad..9291f564 100644
--- a/tools/quake3/q3map2/facebsp.c
+++ b/tools/quake3/q3map2/facebsp.c
@@ -244,6 +244,7 @@ void BuildFaceTree_r( node_t *node, face_t *list )
 	winding_t	*frontWinding, *backWinding;
 	int			i;
 	int			splitPlaneNum, compileFlags;
+	qboolean isstruct = qfalse;
 	
 	
 	/* count faces left */
@@ -269,7 +270,6 @@ void BuildFaceTree_r( node_t *node, face_t *list )
 	childLists[0] = NULL;
 	childLists[1] = NULL;
 
-	qboolean isstruct = 0;
 	for( split = list; split; split = next )
 	{
 		/* set next */
diff --git a/tools/quake3/q3map2/map.c b/tools/quake3/q3map2/map.c
index 1440131e..9b7ba71a 100644
--- a/tools/quake3/q3map2/map.c
+++ b/tools/quake3/q3map2/map.c
@@ -600,6 +600,7 @@ and links it to the current entity
 static void MergeOrigin(entity_t *ent, vec3_t origin)
 {
 	vec3_t adjustment;
+	char string[128];
 
 	/* we have not parsed the brush completely yet... */
 	GetVectorForKey( ent, "origin", ent->origin );
@@ -608,7 +609,6 @@ static void MergeOrigin(entity_t *ent, vec3_t origin)
 	VectorAdd(adjustment, ent->origin, ent->origin);
 	VectorCopy(origin, ent->originbrush_origin);
 
-	char string[128];
 	sprintf(string, "%f %f %f", ent->origin[0], ent->origin[1], ent->origin[2]);
 	SetKeyValue(ent, "origin", string);
 }