1
0
Fork 0
forked from fte/fteqw

work around q3map2

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4417 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-06-30 00:58:49 +00:00
parent 229eb39bfc
commit 00a6409804

View file

@ -125,8 +125,8 @@ void AddPointToBounds (vec3_t v, vec3_t mins, vec3_t maxs)
void ClearBounds (vec3_t mins, vec3_t maxs) void ClearBounds (vec3_t mins, vec3_t maxs)
{ {
mins[0] = mins[1] = mins[2] = 99999; mins[0] = mins[1] = mins[2] = 999999999;
maxs[0] = maxs[1] = maxs[2] = -99999; maxs[0] = maxs[1] = maxs[2] = -999999999;
} }
@ -1068,8 +1068,8 @@ qboolean CMod_LoadSubmodels (lump_t *l)
out->numsurfaces = LittleLong (in->numfaces); out->numsurfaces = LittleLong (in->numfaces);
} }
VectorCopy(map_cmodels[0].mins, loadmodel->mins); AddPointToBounds(map_cmodels[0].mins, loadmodel->mins, loadmodel->maxs);
VectorCopy(map_cmodels[0].maxs, loadmodel->maxs); AddPointToBounds(map_cmodels[0].maxs, loadmodel->mins, loadmodel->maxs);
return true; return true;
} }
@ -2007,8 +2007,8 @@ qboolean CModQ3_LoadSubmodels (lump_t *l)
//submodels //submodels
} }
VectorCopy(map_cmodels[0].mins, loadmodel->mins); AddPointToBounds(map_cmodels[0].mins, loadmodel->mins, loadmodel->maxs);
VectorCopy(map_cmodels[0].maxs, loadmodel->maxs); AddPointToBounds(map_cmodels[0].maxs, loadmodel->mins, loadmodel->maxs);
return true; return true;
} }
@ -2968,6 +2968,8 @@ qboolean CModQ3_LoadNodes (lump_t *l)
out->minmaxs[j] = LittleLong (in->mins[j]); out->minmaxs[j] = LittleLong (in->mins[j]);
out->minmaxs[3+j] = LittleLong (in->maxs[j]); out->minmaxs[3+j] = LittleLong (in->maxs[j]);
} }
AddPointToBounds(out->minmaxs, loadmodel->mins, loadmodel->maxs);
AddPointToBounds(out->minmaxs+3, loadmodel->mins, loadmodel->maxs);
p = LittleLong(in->plane); p = LittleLong(in->plane);
out->plane = loadmodel->planes + p; out->plane = loadmodel->planes + p;
@ -3807,6 +3809,8 @@ cmodel_t *CM_LoadMap (char *name, char *filein, qboolean clientload, unsigned *c
loadmodel->lightmaps.height = 128; loadmodel->lightmaps.height = 128;
} }
ClearBounds(loadmodel->mins, loadmodel->maxs);
switch(header.version) switch(header.version)
{ {
default: default: