Merge remote branch 'origin/master' into samual/hagar_secondary_autorelease

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / csqc_builtins.qc

diff --git a/qcsrc/client/csqc_builtins.qc b/qcsrc/client/csqc_builtins.qc
index ec2ab9a3195892c29191d391e9d30e90cd380ebb..48012e7a4ccf4a4c4fcd56dac92109dc095dd33f 100644 (file)
--- a/qcsrc/client/csqc_builtins.qc
+++ b/qcsrc/client/csqc_builtins.qc
@@ -79,6 +79,7 @@ void ()                                                                       R_ClearScene = #300;
 void (float mask)                                                      R_AddEntities = #301;
 void (entity e)                                                                R_AddEntity = #302;
 float (float property, ...)                                            R_SetView = #303;
+vector (float property, ...)                                           R_SetView3fv = #303;
 void ()                                                                        R_RenderScene = #304;
 void (vector org, float radius, vector rgb)                            R_AddDynamicLight = #305;
 void ()                                                                        R_CalcRefDef = #306;
@@ -235,6 +236,7 @@ float (string s)    tokenize = #441;
 string (float argnum)  argv = #442;
 
 string (string s) cvar_string = #448;
+string (string s) cvar_defstring = #482;
 
 float ()                                               buf_create = #460;
 void (float bufhandle)                                 buf_del = #461;
@@ -292,6 +294,7 @@ entity(vector org, float rad) findradius = #22;
 
 string(float uselocaltime, string format, ...) strftime = #478;
 float(float timer) gettime = #519;
+#define GETTIME_REALTIME 1
 #define GETTIME_CDTRACK 4
 
 float(string s) tokenize_console = #514;
@@ -318,3 +321,18 @@ float particles_alphamin, particles_alphamax;
 vector particles_colormin, particles_colormax;
 void(float effectindex, entity own, vector org_from, vector org_to, vector dir_from, vector dir_to, float countmultiplier, float flags)        boxparticles = #502;
 string(string format, ...) sprintf = #627;
+
+float(string name) cvar_type = #495;
+float CVAR_TYPEFLAG_EXISTS = 1;
+float CVAR_TYPEFLAG_SAVED = 2;
+float CVAR_TYPEFLAG_PRIVATE = 4;
+float CVAR_TYPEFLAG_ENGINE = 8;
+float CVAR_TYPEFLAG_HASDESCRIPTION = 16;
+float CVAR_TYPEFLAG_READONLY = 32;
+
+void (entity e, float chan, string samp, float vol, float atten, float pitchshift, float flags)        sound7 = #8;
+
+float trace_dphitcontents;
+float trace_networkentity;
+
+string(string search, string replace, string subject) strreplace = #484;