From: havoc Date: Mon, 27 Jun 2011 02:20:27 +0000 (+0000) Subject: fix C++ compile errors X-Git-Tag: xonotic-v0.5.0~96 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b082737de5bcd5983360b079db9419c9db5e6c29;p=xonotic%2Fdarkplaces.git fix C++ compile errors git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11223 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=6ad14022e79720dfd015045545f889837d18e92e --- diff --git a/cl_main.c b/cl_main.c index 7372d1d2..420203b4 100644 --- a/cl_main.c +++ b/cl_main.c @@ -1262,7 +1262,7 @@ void CL_UpdateNetworkEntityTrail(entity_t *e) if (e->render.flags & RENDER_GLOWTRAIL) trailtype = EFFECT_TR_GLOWTRAIL; if (e->state_current.traileffectnum) - trailtype = e->state_current.traileffectnum; + trailtype = (effectnameindex_t)e->state_current.traileffectnum; // check if a trail is allowed (it is not after a teleport for example) if (trailtype && e->persistent.trail_allowed) { @@ -1561,7 +1561,7 @@ void CL_LinkNetworkEntity(entity_t *e) if (e->render.flags & RENDER_GLOWTRAIL) trailtype = EFFECT_TR_GLOWTRAIL; if (e->state_current.traileffectnum) - trailtype = e->state_current.traileffectnum; + trailtype = (effectnameindex_t)e->state_current.traileffectnum; if (trailtype) CL_ParticleTrail(trailtype, 1, origin, origin, vec3_origin, vec3_origin, NULL, e->state_current.glowcolor, true, false, NULL, NULL);