From 385719b2c60565a899cacc94d315aae7bc6fbdd8 Mon Sep 17 00:00:00 2001 From: divverent Date: Thu, 29 Aug 2013 12:40:35 +0000 Subject: [PATCH] sync dpdefs git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11999 d7cf8633-e32d-0410-b094-e92efae38249 --- dpdefs/csprogsdefs.qc | 5 ++++- dpdefs/keycodes.qc | 22 +++++++++++----------- dpdefs/menudefs.qc | 4 ++-- dpdefs/progsdefs.qc | 2 +- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dpdefs/csprogsdefs.qc b/dpdefs/csprogsdefs.qc index c9b9ce9c..af0cb691 100644 --- a/dpdefs/csprogsdefs.qc +++ b/dpdefs/csprogsdefs.qc @@ -335,7 +335,7 @@ void(entity e, vector o) setorigin = #2; void(entity e, string m) setmodel = #3; void(entity e, vector min, vector max) setsize = #4; -void() break = #6; +void() break_to_debugger = #6; float() random = #7; void(entity e, float chan, string samp) sound = #8; vector(vector v) normalize = #9; @@ -1447,6 +1447,9 @@ float PARTICLES_USEALPHA = 1; float particles_alphamin, particles_alphamax; float PARTICLES_USECOLOR = 2; vector particles_colormin, particles_colormax; +float PARTICLES_USEFADE = 4; // fades the COUNT (fade alpha using alphamin/alphamax) +float particles_fade; +float PARTICLES_DRAWASTRAIL = 128; void(float effectindex, entity own, vector org_from, vector org_to, vector dir_from, vector dir_to, float countmultiplier, float flags) boxparticles = #502; float trace_networkentity; const float RF_FULLBRIGHT = 256; diff --git a/dpdefs/keycodes.qc b/dpdefs/keycodes.qc index 76945736..65fe815b 100644 --- a/dpdefs/keycodes.qc +++ b/dpdefs/keycodes.qc @@ -46,28 +46,28 @@ float K_CAPSLOCK = 155; float K_SCROLLLOCK = 156; float K_KP_0 = 157; -float K_KP_INS = K_KP_0; +float K_KP_INS = 157; // same as K_KP_0 float K_KP_1 = 158; -float K_KP_END = K_KP_1; +float K_KP_END = 158; // same as K_KP_1 float K_KP_2 = 159; -float K_KP_DOWNARROW = K_KP_2; +float K_KP_DOWNARROW = 159; // same as K_KP_2 float K_KP_3 = 160; -float K_KP_PGDN = K_KP_3; +float K_KP_PGDN = 160; // same as K_KP_3 float K_KP_4 = 161; -float K_KP_LEFTARROW = K_KP_4; +float K_KP_LEFTARROW = 161; // same as K_KP_4 float K_KP_5 = 162; float K_KP_6 = 163; -float K_KP_RIGHTARROW = K_KP_6; +float K_KP_RIGHTARROW = 163; // same as K_KP_6 float K_KP_7 = 164; -float K_KP_HOME = K_KP_7; +float K_KP_HOME = 164; // same as K_KP_7 float K_KP_8 = 165; -float K_KP_UPARROW = K_KP_8; +float K_KP_UPARROW = 165; // same as K_KP_8 float K_KP_9 = 166; -float K_KP_PGUP = K_KP_9; +float K_KP_PGUP = 166; // same as K_KP_9 float K_KP_PERIOD = 167; -float K_KP_DEL = K_KP_PERIOD; +float K_KP_DEL = 167; // same as K_KP_PERIOD float K_KP_DIVIDE = 168; -float K_KP_SLASH = K_KP_DIVIDE; +float K_KP_SLASH = 168; // same as K_KP_DIVIDE float K_KP_MULTIPLY = 169; float K_KP_MINUS = 170; float K_KP_PLUS = 171; diff --git a/dpdefs/menudefs.qc b/dpdefs/menudefs.qc index c1198746..4885f291 100644 --- a/dpdefs/menudefs.qc +++ b/dpdefs/menudefs.qc @@ -96,7 +96,7 @@ float ERR_BADFILENAME = -4; // fopen float ERR_NULLSTRING = -1; float ERR_BADDRAWFLAG = -2; float ERR_BADSCALE = -3; -float ERR_BADSIZE = ERR_BADSCALE; +float ERR_BADSIZE = -3; // same as ERR_BADSCALE float ERR_NOTCACHED = -4; // server list stuff @@ -253,7 +253,7 @@ vector stov(string s) = #55; string strzone(string s) = #56; void strunzone(string s) = #57; -float tokenize(string s) = #58 +float tokenize(string s) = #58; string argv(float n) = #59; float isserver(void) = #60; diff --git a/dpdefs/progsdefs.qc b/dpdefs/progsdefs.qc index 912c3eca..2ccd8431 100644 --- a/dpdefs/progsdefs.qc +++ b/dpdefs/progsdefs.qc @@ -402,7 +402,7 @@ void(entity e, vector o) setorigin = #2; void(entity e, string m) setmodel = #3; // set movetype and solid first void(entity e, vector min, vector max) setsize = #4; // #5 was removed -void() break = #6; +void() break_to_debugger = #6; float() random = #7; // returns 0 - 1 void(entity e, float chan, string samp, float vol, float atten) sound = #8; vector(vector v) normalize = #9; -- 2.39.2