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

Fix compilation of the 'nocompat' build config.

Browse source
This commit is contained in:
Marco Cawthorne 2023-06-23 15:06:54 -07:00
parent 2fbf78579d
commit f4044af503
Signed by: eukara
GPG key ID: CE2032F0A2882A22
4 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/client/net_master.c
View file

@ -3387,7 +3387,9 @@ static int CL_ReadServerInfo(char *msg, enum masterprotocol_e prototype, qboolea
else if (prototype == MP_NETQUAKE)
info->special |= SS_NETQUAKE;
#endif
#if defined(Q2CLIENT) || defined(Q3CLIENT) || defined(NQPROT)
else
#endif
info->special |= SS_QUAKEWORLD;
}
if (favorite) //was specifically named, not retrieved from a master.

9
engine/common/gl_q2bsp.c
View file

@ -207,7 +207,9 @@ void Mod_SortShaders(model_t *mod)
#if defined(Q2BSPS) || defined(Q3BSPS)
#ifdef IMAGEFMT_PCX
qbyte *ReadPCXPalette(qbyte *buf, int len, qbyte *out);
#endif
#ifdef SERVERONLY
#define Host_Error SV_Error
@ -4118,7 +4120,8 @@ static qboolean CModRBSP_LoadLightgrid (model_t *loadmodel, qbyte *mod_base, lum
#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);
static int CM_GetQ2Palette (void)
{
@ -4136,6 +4139,7 @@ static int CM_GetQ2Palette (void)
FS_FreeFile(f);
return -1;
}
FS_FreeFile(f);
@ -4164,6 +4168,7 @@ static int CM_GetQ2Palette (void)
return 0;
}
#endif
#endif
#if 0
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);
#ifdef HAVE_CLIENT
#if defined(HAVE_CLIENT) && defined(IMAGEFMT_PCX)
if (CM_GetQ2Palette())
memcpy(q2_palette, host_basepal, 768);
#endif

6
engine/gl/gl_shadow.c
View file

@ -835,6 +835,7 @@ static void SHM_RecursiveWorldNodeQ1_r (dlight_t *dl, mnode_t *node)
SHM_RecursiveWorldNodeQ1_r (dl, node->children[!side]);
}
#ifdef Q1BSPS
void CategorizePlane ( mplane_t *plane );
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);
}
}
#endif
#ifdef Q3BSPS
static void SHM_OrthoWorldLeafsQ3 (dlight_t *dl)
{
int c, i;
@ -992,6 +995,7 @@ static void SHM_OrthoWorldLeafsQ3 (dlight_t *dl)
next:;
}
}
#endif
#ifdef Q2BSPS
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)
{
#ifdef Q1BSPS
case fg_quake:
case fg_halflife:
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);
}
break;
#endif
default:
sh_shadowframe++;

3
engine/server/sv_user.c
View file

@ -6409,7 +6409,10 @@ ucmd_t ucmds[] =
{"sayone", SV_SayOne_f},
{"say", SV_Say_f},
{"say_team", SV_Say_Team_f},
#ifdef NQPROT
{"status", SVNQ_Status_f},
#endif
#ifdef SVRANKING
{"topten", Rank_ListTop10_f},
#endif