Merge branch 'master' into terencehill/cursormode

[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 96e28b96abcc114f01f1bab91e4009bedf2bc937..0fabb0d0c70b5eb86d9edca2d752efd2e466ee3e 100644 (file)
--- a/qcsrc/client/csqc_builtins.qc
+++ b/qcsrc/client/csqc_builtins.qc
@@ -90,7 +90,7 @@ vector (vector v)                                                     cs_project = #311;
 void   drawline(float width, vector pos1, vector pos2, vector rgb, float alpha, float flags) = #315;
 float  iscachedpic(string name)        = #316;
 string precache_pic(string name, ...)  = #317;
-vector drawgetimagesize(string pic) = #318;
+vector draw_getimagesize(string pic) = #318;
 void   freepic(string name)            = #319;
 float  drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag) = #320;
 float  drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag) = #321;
@@ -123,8 +123,9 @@ void (float scale)                                                  setsensitivityscale = #346;
 float (float framenum)                                                 getinputstate = #345;
 void (entity e)                                                                        runstandardplayerphysics = #347;
 
-string (float playernum, string key)                                   getplayerkey = #348;
+string (float playernum, string key)                                   getplayerkeyvalue = #348;
 void (string cmdname)                                                  registercmd = #352;
+void(float usecursor)                                                  setcursormode = #343;
 vector ()                                                              getmousepos = #344;
 
 string (string s)                                                      uncolorstring = #170;
@@ -174,14 +175,14 @@ float(entity e, float s) getsurfacenumtriangles = #628;
 vector(entity e, float s, float n) getsurfacetriangle = #629;
 
 
-float (float a, float b) min = #94;
+float (float a, float b, ...) min = #94;
 float (float a, float b, float c) min3 = #94;
 float (float a, float b, float c, float d) min4 = #94;
 float (float a, float b, float c, float d, float e) min5 = #94;
 float (float a, float b, float c, float d, float e, float f) min6 = #94;
 float (float a, float b, float c, float d, float e, float f, float g) min7 = #94;
 float (float a, float b, float c, float d, float e, float f, float g, float h) min8 = #94;
-float (float a, float b) max = #95;
+float (float a, float b, ...) max = #95;
 float (float a, float b, float c) max3 = #95;
 float (float a, float b, float c, float d) max4 = #95;
 float (float a, float b, float c, float d, float e) max5 = #95;