From 4c3cb2910889e3fff0452c62eabdda42fac0718a Mon Sep 17 00:00:00 2001 From: Spoike Date: Fri, 16 May 2014 01:48:12 +0000 Subject: [PATCH] git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4658 fc73d0e0-1445-4013-8a0c-d673dee63da5 --- engine/client/cl_tent.c | 2 ++ engine/common/particles.h | 2 ++ engine/server/svmodel.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/engine/client/cl_tent.c b/engine/client/cl_tent.c index 31c65a4d7..bcb82c431 100644 --- a/engine/client/cl_tent.c +++ b/engine/client/cl_tent.c @@ -545,6 +545,7 @@ void CL_RegisterParticles(void) ptqw_blood = P_FindParticleType("TE_BLOOD"); ptqw_lightningblood = P_FindParticleType("TE_LIGHTNINGBLOOD"); +#ifdef Q2CLIENT if (cls.protocol == CP_QUAKE2) { for (i = 0; i < sizeof(pt_q2)/sizeof(pt_q2[0]); i++) @@ -572,6 +573,7 @@ void CL_RegisterParticles(void) rtq2_rocket = P_INVALID; rtq2_grenade = P_INVALID; } +#endif rtqw_railtrail = P_FindParticleType("TE_RAILTRAIL"); rtfte_lightning1 = P_FindParticleType("TE_LIGHTNING1"); diff --git a/engine/common/particles.h b/engine/common/particles.h index 741bc8351..48a43262c 100644 --- a/engine/common/particles.h +++ b/engine/common/particles.h @@ -40,6 +40,7 @@ extern int ptqw_blood, ptqw_lightningblood, +#ifdef Q2CLIENT ptq2_blood, rtq2_railtrail, rtq2_blastertrail, @@ -48,6 +49,7 @@ extern int rtq2_gib, rtq2_rocket, rtq2_grenade, +#endif rtqw_railtrail, //common to zquake/fuhquake/fte rtfte_lightning1, diff --git a/engine/server/svmodel.c b/engine/server/svmodel.c index dd382a43d..9552f0ba6 100644 --- a/engine/server/svmodel.c +++ b/engine/server/svmodel.c @@ -219,7 +219,7 @@ int Mod_RegisterModelFormatMagic(void *module, const char *formatname, unsigned { return 0; } -void Mod_UnRegisterModelFormat(int idx) +void Mod_UnRegisterModelFormat(void *module, int idx) { } void Mod_UnRegisterAllModelFormats(void *module)