fix two msvc compile errors
authordivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Mon, 13 Apr 2009 19:51:54 +0000 (19:51 +0000)
committerdivverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Mon, 13 Apr 2009 19:51:54 +0000 (19:51 +0000)
git-svn-id: svn://svn.icculus.org/netradiant/trunk@319 61c419a2-8eb2-4b30-bcec-8cead039b335

tools/quake3/q3map2/facebsp.c
tools/quake3/q3map2/map.c

index 702765a..9291f56 100644 (file)
@@ -244,6 +244,7 @@ void BuildFaceTree_r( node_t *node, face_t *list )
        winding_t       *frontWinding, *backWinding;
        int                     i;
        int                     splitPlaneNum, compileFlags;
        winding_t       *frontWinding, *backWinding;
        int                     i;
        int                     splitPlaneNum, compileFlags;
+       qboolean isstruct = qfalse;
        
        
        /* count faces left */
        
        
        /* count faces left */
@@ -269,7 +270,6 @@ void BuildFaceTree_r( node_t *node, face_t *list )
        childLists[0] = NULL;
        childLists[1] = NULL;
 
        childLists[0] = NULL;
        childLists[1] = NULL;
 
-       qboolean isstruct = 0;
        for( split = list; split; split = next )
        {
                /* set next */
        for( split = list; split; split = next )
        {
                /* set next */
index 1440131..9b7ba71 100644 (file)
@@ -600,6 +600,7 @@ and links it to the current entity
 static void MergeOrigin(entity_t *ent, vec3_t origin)
 {
        vec3_t adjustment;
 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 );
 
        /* 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);
 
        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);
 }
        sprintf(string, "%f %f %f", ent->origin[0], ent->origin[1], ent->origin[2]);
        SetKeyValue(ent, "origin", string);
 }