From: vortex Date: Sun, 8 May 2011 20:33:48 +0000 (+0000) Subject: renabe builtin particle->spawnparticle (DP_CSQC_SPAWNPARTICLE) because it conflicts... X-Git-Tag: xonotic-v0.5.0~208 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49df65b09779d1b2524795440d2cc8c76acce518;p=xonotic%2Fdarkplaces.git renabe builtin particle->spawnparticle (DP_CSQC_SPAWNPARTICLE) because it conflicts with quake's particle(). git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11133 d7cf8633-e32d-0410-b094-e92efae38249 ::stable-branch::merge=71c47f87ec7e26b5d851978ca828c76a22e0ef59 --- diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc index 7ff4fcad..e5a7f3d0 100644 --- a/dpdefs/csprogsdefs.qc +++ b/dpdefs/csprogsdefs.qc @@ -675,7 +675,7 @@ void(float theme) particletheme = #524; // restore p_ globals from saved theme float() particlethemesave = #525; // save p_ globals to new particletheme and return it's index void(float theme) particlethemeupdate = #525; // save p_ globals to new particletheme and return it's index void(float theme) particlethemefree = #526; // delete a particle theme -float(vector org, vector vel) particle = #527; // returns 0 when failed, 1 when spawned +float(vector org, vector vel) spawnparticle = #527; // returns 0 when failed, 1 when spawned float(vector org, vector vel, float theme) quickparticle = #527; // not reading globals, just theme, returns 0 when failed, 1 when spawned float(vector org, vector vel, float delay, float collisiondelay) delayedparticle = #528; float(vector org, vector vel, float delay, float collisiondelay, float theme) quickdelayedparticle = #528;