Fix compilation of the 'nocompat' build config.
This commit is contained in:
parent
2fbf78579d
commit
f4044af503
4 changed files with 18 additions and 2 deletions
|
@ -3387,7 +3387,9 @@ static int CL_ReadServerInfo(char *msg, enum masterprotocol_e prototype, qboolea
|
||||||
else if (prototype == MP_NETQUAKE)
|
else if (prototype == MP_NETQUAKE)
|
||||||
info->special |= SS_NETQUAKE;
|
info->special |= SS_NETQUAKE;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(Q2CLIENT) || defined(Q3CLIENT) || defined(NQPROT)
|
||||||
else
|
else
|
||||||
|
#endif
|
||||||
info->special |= SS_QUAKEWORLD;
|
info->special |= SS_QUAKEWORLD;
|
||||||
}
|
}
|
||||||
if (favorite) //was specifically named, not retrieved from a master.
|
if (favorite) //was specifically named, not retrieved from a master.
|
||||||
|
|
|
@ -207,7 +207,9 @@ void Mod_SortShaders(model_t *mod)
|
||||||
|
|
||||||
#if defined(Q2BSPS) || defined(Q3BSPS)
|
#if defined(Q2BSPS) || defined(Q3BSPS)
|
||||||
|
|
||||||
|
#ifdef IMAGEFMT_PCX
|
||||||
qbyte *ReadPCXPalette(qbyte *buf, int len, qbyte *out);
|
qbyte *ReadPCXPalette(qbyte *buf, int len, qbyte *out);
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef SERVERONLY
|
#ifdef SERVERONLY
|
||||||
#define Host_Error SV_Error
|
#define Host_Error SV_Error
|
||||||
|
@ -4118,7 +4120,8 @@ static qboolean CModRBSP_LoadLightgrid (model_t *loadmodel, qbyte *mod_base, lum
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(SERVERONLY) && defined(Q2BSPS)
|
#if !defined(SERVERONLY) && (defined(Q2BSPS) || defined(Q3BSPS))
|
||||||
|
#ifdef IMAGEFMT_PCX
|
||||||
qbyte *ReadPCXPalette(qbyte *buf, int len, qbyte *out);
|
qbyte *ReadPCXPalette(qbyte *buf, int len, qbyte *out);
|
||||||
static int CM_GetQ2Palette (void)
|
static int CM_GetQ2Palette (void)
|
||||||
{
|
{
|
||||||
|
@ -4136,6 +4139,7 @@ static int CM_GetQ2Palette (void)
|
||||||
FS_FreeFile(f);
|
FS_FreeFile(f);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
FS_FreeFile(f);
|
FS_FreeFile(f);
|
||||||
|
|
||||||
|
|
||||||
|
@ -4164,6 +4168,7 @@ static int CM_GetQ2Palette (void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
static void CM_OpenAllPortals(model_t *mod, char *ents) //this is a compleate hack. About as compleate as possible.
|
static void CM_OpenAllPortals(model_t *mod, char *ents) //this is a compleate hack. About as compleate as possible.
|
||||||
|
@ -4917,7 +4922,7 @@ static cmodel_t *CM_LoadMap (model_t *mod, qbyte *filein, size_t filelen, qboole
|
||||||
}
|
}
|
||||||
BSPX_Setup(mod, mod_base, filelen, header.lumps, i);
|
BSPX_Setup(mod, mod_base, filelen, header.lumps, i);
|
||||||
|
|
||||||
#ifdef HAVE_CLIENT
|
#if defined(HAVE_CLIENT) && defined(IMAGEFMT_PCX)
|
||||||
if (CM_GetQ2Palette())
|
if (CM_GetQ2Palette())
|
||||||
memcpy(q2_palette, host_basepal, 768);
|
memcpy(q2_palette, host_basepal, 768);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -835,6 +835,7 @@ static void SHM_RecursiveWorldNodeQ1_r (dlight_t *dl, mnode_t *node)
|
||||||
SHM_RecursiveWorldNodeQ1_r (dl, node->children[!side]);
|
SHM_RecursiveWorldNodeQ1_r (dl, node->children[!side]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef Q1BSPS
|
||||||
void CategorizePlane ( mplane_t *plane );
|
void CategorizePlane ( mplane_t *plane );
|
||||||
static void SHM_OrthoWorldLeafsQ1 (dlight_t *dl)
|
static void SHM_OrthoWorldLeafsQ1 (dlight_t *dl)
|
||||||
{
|
{
|
||||||
|
@ -934,7 +935,9 @@ void Q1BSP_GenerateShadowMesh(model_t *model, dlight_t *dl, const qbyte *lightvi
|
||||||
SHM_RecursiveWorldNodeQ1_r(dl, cl.worldmodel->nodes);
|
SHM_RecursiveWorldNodeQ1_r(dl, cl.worldmodel->nodes);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef Q3BSPS
|
||||||
static void SHM_OrthoWorldLeafsQ3 (dlight_t *dl)
|
static void SHM_OrthoWorldLeafsQ3 (dlight_t *dl)
|
||||||
{
|
{
|
||||||
int c, i;
|
int c, i;
|
||||||
|
@ -992,6 +995,7 @@ static void SHM_OrthoWorldLeafsQ3 (dlight_t *dl)
|
||||||
next:;
|
next:;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef Q2BSPS
|
#ifdef Q2BSPS
|
||||||
static void SHM_RecursiveWorldNodeQ2_r (dlight_t *dl, mnode_t *node)
|
static void SHM_RecursiveWorldNodeQ2_r (dlight_t *dl, mnode_t *node)
|
||||||
|
@ -1722,6 +1726,7 @@ static struct shadowmesh_s *SHM_BuildShadowMesh(dlight_t *dl, unsigned char *lvi
|
||||||
{
|
{
|
||||||
switch(cl.worldmodel->fromgame)
|
switch(cl.worldmodel->fromgame)
|
||||||
{
|
{
|
||||||
|
#ifdef Q1BSPS
|
||||||
case fg_quake:
|
case fg_quake:
|
||||||
case fg_halflife:
|
case fg_halflife:
|
||||||
if (type == SMT_ORTHO)
|
if (type == SMT_ORTHO)
|
||||||
|
@ -1732,6 +1737,7 @@ static struct shadowmesh_s *SHM_BuildShadowMesh(dlight_t *dl, unsigned char *lvi
|
||||||
SHM_RecursiveWorldNodeQ1_r(dl, cl.worldmodel->nodes);
|
SHM_RecursiveWorldNodeQ1_r(dl, cl.worldmodel->nodes);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
sh_shadowframe++;
|
sh_shadowframe++;
|
||||||
|
|
||||||
|
|
|
@ -6409,7 +6409,10 @@ ucmd_t ucmds[] =
|
||||||
{"sayone", SV_SayOne_f},
|
{"sayone", SV_SayOne_f},
|
||||||
{"say", SV_Say_f},
|
{"say", SV_Say_f},
|
||||||
{"say_team", SV_Say_Team_f},
|
{"say_team", SV_Say_Team_f},
|
||||||
|
#ifdef NQPROT
|
||||||
{"status", SVNQ_Status_f},
|
{"status", SVNQ_Status_f},
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef SVRANKING
|
#ifdef SVRANKING
|
||||||
{"topten", Rank_ListTop10_f},
|
{"topten", Rank_ListTop10_f},
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue