team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

a couple of fixes for things that didn't compile. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4515 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2013-10-29 17:58:20 +00:00
parent fb86222fc7
commit 365e104f88
4 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/net_master.c
View File

@ -39,7 +39,7 @@ cvar_t slist_writeserverstxt = SCVAR("slist_writeservers", "0");
void CL_MasterListParse(netadrtype_t adrtype, int type, qboolean slashpad);
void CL_QueryServers(void);
int CL_ReadServerInfo(char *msg, int servertype, qboolean favorite);
int CL_ReadServerInfo(char *msg, enum masterprotocol_e prototype, qboolean favorite);
void MasterInfo_RemoveAllPlayers(void);
master_t *master;

12
engine/gl/gl_heightmap.c
View File

@ -497,7 +497,9 @@ static hmsection_t *Terr_GenerateSection(heightmap_t *hm, int sx, int sy)
s = Z_Malloc(sizeof(*s));
if (!s)
return NULL;
#ifndef SERVERONLY
s->lightmap = -1;
#endif
}
InsertLinkBefore(&s->recycle, &hm->recycle);
@ -507,7 +509,9 @@ static hmsection_t *Terr_GenerateSection(heightmap_t *hm, int sx, int sy)
hm->activesections++;
s->hmmod = hm;
}
#ifndef SERVERONLY
s->numents = 0;
#endif
s->flags = TSF_DIRTY;
return s;
}
@ -633,12 +637,12 @@ static void Terr_GenerateDefault(heightmap_t *hm, hmsection_t *s)
s->flags |= TSF_FAILEDLOAD;
s->holes = 0;
#ifndef SERVERONLY
Q_strncpyz(s->texname[0], "", sizeof(s->texname[0]));
Q_strncpyz(s->texname[1], "", sizeof(s->texname[1]));
Q_strncpyz(s->texname[2], "", sizeof(s->texname[2]));
Q_strncpyz(s->texname[3], "", sizeof(s->texname[3]));
#ifndef SERVERONLY
if (s->lightmap >= 0)
{
int j;
@ -883,7 +887,11 @@ static void Terr_LoadSection(heightmap_t *hm, hmsection_t *s, int sx, int sy, un
{
//noload avoids recursion.
s = Terr_GetSection(hm, sx+x, sy+y, TGS_NOLOAD|TGS_NODOWNLOAD|TGS_IGNOREFAILED);
if (!s || s->lightmap < 0)
if (!s || s->flags & TSF_FAILEDLOAD
#ifndef SERVERONLY
|| s->lightmap < 0
#endif
)
{
offset = block->offset[x + y*SECTIONSPERBLOCK];
if (!offset)

1
engine/server/sv_main.c
View File

@ -4935,7 +4935,6 @@ void SV_InitNet (void)
if (isDedicated)
#endif
{
NET_Init ();
Netchan_Init ();
}

29
engine/server/svmodel.c
View File

@ -199,12 +199,31 @@ void SVQ1_LightPointValues(model_t *model, vec3_t point, vec3_t res_diffuse, vec
Mod_Init
===============
*/
void Mod_Init (void)
void Mod_Init (qboolean initial)
{
if (initial)
{
memset (mod_novis, 0xff, sizeof(mod_novis));
Cvar_Register(&sv_nogetlight, "Memory preservation");
Cvar_Register (&dpcompat_psa_ungroup, "Darkplaces compatibility");
Cvar_Register (&r_noframegrouplerp, "Graphical Nicaties");
}
}
int Mod_RegisterModelFormatText(void *module, const char *formatname, char *magictext, qboolean (QDECL *load) (struct model_s *mod, void *buffer))
{
return 0;
}
int Mod_RegisterModelFormatMagic(void *module, const char *formatname, unsigned int magic, qboolean (QDECL *load) (struct model_s *mod, void *buffer))
{
return 0;
}
void Mod_UnRegisterModelFormat(int idx)
{
}
void Mod_UnRegisterAllModelFormats(void *module)
{
memset (mod_novis, 0xff, sizeof(mod_novis));
Cvar_Register(&sv_nogetlight, "Memory preservation");
Cvar_Register (&dpcompat_psa_ungroup, "Darkplaces compatibility");
Cvar_Register (&r_noframegrouplerp, "Graphical Nicaties");
}
/*