eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Forgot to reload holes, sorry.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4093 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-07-22 04:30:09 +00:00
parent 95aa0b5eeb
commit 8d3f45587e
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
engine/gl/gl_heightmap.c
View file

@ -295,7 +295,19 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
if (ds) if (ds)
{ {
s->flags = ds->flags | TSF_DIRTY; s->flags = ds->flags | TSF_DIRTY;
/*load the heights*/
for (i = 0; i < SECTHEIGHTSIZE*SECTHEIGHTSIZE; i++)
{
s->heights[i] = LittleFloat(ds->heights[i]);
}
s->minh = ds->minh;
s->maxh = ds->maxh;
s->waterheight = ds->waterheight;
s->holes = ds->holes;
#ifndef SERVERONLY #ifndef SERVERONLY
/*deal with textures*/
Q_strncpyz(s->texname[0], ds->texname[0], sizeof(s->texname[0])); Q_strncpyz(s->texname[0], ds->texname[0], sizeof(s->texname[0]));
Q_strncpyz(s->texname[1], ds->texname[1], sizeof(s->texname[1])); Q_strncpyz(s->texname[1], ds->texname[1], sizeof(s->texname[1]));
Q_strncpyz(s->texname[2], ds->texname[2], sizeof(s->texname[2])); Q_strncpyz(s->texname[2], ds->texname[2], sizeof(s->texname[2]));
@ -306,6 +318,7 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
CL_CheckOrEnqueDownloadFile(s->texname[2], NULL, 0); CL_CheckOrEnqueDownloadFile(s->texname[2], NULL, 0);
CL_CheckOrEnqueDownloadFile(s->texname[3], NULL, 0); CL_CheckOrEnqueDownloadFile(s->texname[3], NULL, 0);
/*load in the mixture/lighting*/
if (s->lightmap >= 0) if (s->lightmap >= 0)
{ {
lm = lightmap[s->lightmap]->lightmaps; lm = lightmap[s->lightmap]->lightmaps;
@ -321,18 +334,8 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
lightmap[s->lightmap]->rectchange.w = HMLMSTRIDE; lightmap[s->lightmap]->rectchange.w = HMLMSTRIDE;
lightmap[s->lightmap]->rectchange.h = HMLMSTRIDE; lightmap[s->lightmap]->rectchange.h = HMLMSTRIDE;
} }
#endif
/*load the heights too*/ /*load any static ents*/
for (i = 0; i < SECTHEIGHTSIZE*SECTHEIGHTSIZE; i++)
{
s->heights[i] = LittleFloat(ds->heights[i]);
}
s->minh = ds->minh;
s->maxh = ds->maxh;
s->waterheight = ds->waterheight;
#ifndef SERVERONLY
s->numents = ds->numents; s->numents = ds->numents;
s->maxents = s->numents; s->maxents = s->numents;
if (s->maxents) if (s->maxents)