fix two msvc compile errors
git-svn-id: svn://svn.icculus.org/netradiant/trunk@319 61c419a2-8eb2-4b30-bcec-8cead039b335
This commit is contained in:
parent
185afa1e25
commit
68a9e95faf
|
|
@ -244,6 +244,7 @@ void BuildFaceTree_r( node_t *node, face_t *list )
|
||||||
winding_t *frontWinding, *backWinding;
|
winding_t *frontWinding, *backWinding;
|
||||||
int i;
|
int i;
|
||||||
int splitPlaneNum, compileFlags;
|
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[0] = NULL;
|
||||||
childLists[1] = NULL;
|
childLists[1] = NULL;
|
||||||
|
|
||||||
qboolean isstruct = 0;
|
|
||||||
for( split = list; split; split = next )
|
for( split = list; split; split = next )
|
||||||
{
|
{
|
||||||
/* set next */
|
/* set next */
|
||||||
|
|
|
||||||
|
|
@ -600,6 +600,7 @@ and links it to the current entity
|
||||||
static void MergeOrigin(entity_t *ent, vec3_t origin)
|
static void MergeOrigin(entity_t *ent, vec3_t origin)
|
||||||
{
|
{
|
||||||
vec3_t adjustment;
|
vec3_t adjustment;
|
||||||
|
char string[128];
|
||||||
|
|
||||||
/* we have not parsed the brush completely yet... */
|
/* we have not parsed the brush completely yet... */
|
||||||
GetVectorForKey( ent, "origin", ent->origin );
|
GetVectorForKey( ent, "origin", ent->origin );
|
||||||
|
|
@ -608,7 +609,6 @@ static void MergeOrigin(entity_t *ent, vec3_t origin)
|
||||||
VectorAdd(adjustment, ent->origin, ent->origin);
|
VectorAdd(adjustment, ent->origin, ent->origin);
|
||||||
VectorCopy(origin, ent->originbrush_origin);
|
VectorCopy(origin, ent->originbrush_origin);
|
||||||
|
|
||||||
char string[128];
|
|
||||||
sprintf(string, "%f %f %f", ent->origin[0], ent->origin[1], ent->origin[2]);
|
sprintf(string, "%f %f %f", ent->origin[0], ent->origin[1], ent->origin[2]);
|
||||||
SetKeyValue(ent, "origin", string);
|
SetKeyValue(ent, "origin", string);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user