Merge remote branch 'origin/master' into akari/irc

[xonotic/darkplaces.git] / dpdefs / csprogsdefs.qc

diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc
index 7ff4fcaddc85db1ac6c3daf82c2cc19e71b60522..2100605d5e2ca8f72e8abca72510bec52e465beb 100644 (file)
--- a/dpdefs/csprogsdefs.qc
+++ b/dpdefs/csprogsdefs.qc
@@ -458,6 +458,7 @@ vector (vector v) cs_project = #311;
 void(float width, vector pos1, vector pos2, float flag) drawline = #315;
 float(string name) iscachedpic = #316;
 string(string name, float trywad) precache_pic = #317;
+string(string name) precache_cubemap = #317;
 vector(string picname) draw_getimagesize = #318;
 void(string name) freepic = #319;
 float(vector position, float character, vector scale, vector rgb, float alpha, float flag) drawcharacter = #320;
@@ -675,7 +676,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;