nzp-team
/
fteqw
mirror of https://github.com/nzp-team/fteqw.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dedicated server should compile now 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4106 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2012-09-30 10:54:43 +00:00
parent c6c3d3f4e0
commit d806f20230
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engine/gl/gl_heightmap.c
View File

@ -265,8 +265,8 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
#ifndef SERVERONLY #ifndef SERVERONLY
dsmesh_t *dm; dsmesh_t *dm;
unsigned char *lm; unsigned char *lm;
#endif
float *colours; float *colours;
#endif
void *ptr; void *ptr;
/*queue the file for download if we don't have it yet*/ /*queue the file for download if we don't have it yet*/
@ -428,6 +428,7 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
{ {
s->flags |= TSF_RELIGHT; s->flags |= TSF_RELIGHT;
#ifndef SERVERONLY
if (s->lightmap >= 0) if (s->lightmap >= 0)
{ {
lm = lightmap[s->lightmap]->lightmaps; lm = lightmap[s->lightmap]->lightmaps;
@ -450,6 +451,7 @@ static hmsection_t *Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, in
s->colours[i][2] = 1; s->colours[i][2] = 1;
s->colours[i][3] = 1; s->colours[i][3] = 1;
} }
#endif
#if 0//def DEBUG #if 0//def DEBUG
void *f; void *f;

6
engine/server/svmodel.c
View File

@ -1193,7 +1193,7 @@ qboolean Mod_LoadNodes (lump_t *l, qboolean lm)
if (lm) if (lm)
{ {
dlnode_t *in; dl1node_t *in;
in = (void *)(mod_base + l->fileofs); in = (void *)(mod_base + l->fileofs);
if (l->filelen % sizeof(*in)) if (l->filelen % sizeof(*in))
{ {
@ -1286,7 +1286,7 @@ qboolean Mod_LoadLeafs (lump_t *l, qboolean lm)
if (lm) if (lm)
{ {
dlleaf_t *in; dl1leaf_t *in;
in = (void *)(mod_base + l->fileofs); in = (void *)(mod_base + l->fileofs);
if (l->filelen % sizeof(*in)) if (l->filelen % sizeof(*in))
{ {
@ -1749,7 +1749,7 @@ qboolean Mod_LoadBrushModel (model_t *mod, void *buffer)
i = LittleLong (header->version); i = LittleLong (header->version);
if (i == BSPVERSION_LONG) if (i == BSPVERSION_LONG1)
{ {
loadmodel->fromgame = fg_quake; loadmodel->fromgame = fg_quake;
longm = true; longm = true;