]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
renabe builtin particle->spawnparticle (DP_CSQC_SPAWNPARTICLE) because it conflicts...
authorvortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Sun, 8 May 2011 20:33:48 +0000 (20:33 +0000)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 8 May 2011 21:23:51 +0000 (23:23 +0200)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11133 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=71c47f87ec7e26b5d851978ca828c76a22e0ef59

dpdefs/csprogsdefs.qc

index 7ff4fcaddc85db1ac6c3daf82c2cc19e71b60522..e5a7f3d08b746974586008d44820a110501228b4 100644 (file)
@@ -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;