Merge branch 'master' into mirceakitsune/sandbox

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qc

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 2c089617277e583dbf44ab6914bcb6d9010b1431..87fa4d6274298deefed6d38e18e7d87fa3ef8aca 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1283,12 +1283,12 @@ float sound_allowed(float dest, entity e)
 }
 
 #ifdef COMPAT_XON010_CHANNELS
 }
 
 #ifdef COMPAT_XON010_CHANNELS

-void(entity e, float chan, string samp, float vol, float atten) sound_builtin = #8;
+void(entity e, float chan, string samp, float vol, float atten) builtin_sound = #8;

 void sound(entity e, float chan, string samp, float vol, float atten)
 {
     if (!sound_allowed(MSG_BROADCAST, e))
         return;
 void sound(entity e, float chan, string samp, float vol, float atten)
 {
     if (!sound_allowed(MSG_BROADCAST, e))
         return;

-    sound_builtin(e, chan, samp, vol, atten);
+    builtin_sound(e, chan, samp, vol, atten);

 }
 #else
 #undef sound
 }
 #else
 #undef sound


@@ -1713,7 +1713,7 @@ void make_safe_for_remove(entity e)
 void objerror(string s)
 {
     make_safe_for_remove(self);
 void objerror(string s)
 {
     make_safe_for_remove(self);

-    objerror_builtin(s);
+    builtin_objerror(s);

 }
 
 .float remove_except_protected_forbidden;
 }
 
 .float remove_except_protected_forbidden;


@@ -1721,20 +1721,20 @@ void remove_except_protected(entity e)
 {
        if(e.remove_except_protected_forbidden)
                error("not allowed to remove this at this point");
 {
        if(e.remove_except_protected_forbidden)
                error("not allowed to remove this at this point");

-       remove_builtin(e);
+       builtin_remove(e);

 }
 
 void remove_unsafely(entity e)
 {
     if(e.classname == "spike")
         error("Removing spikes is forbidden (crylink bug), please report");
 }
 
 void remove_unsafely(entity e)
 {
     if(e.classname == "spike")
         error("Removing spikes is forbidden (crylink bug), please report");

-    remove_builtin(e);
+    builtin_remove(e);

 }
 
 void remove_safely(entity e)
 {
     make_safe_for_remove(e);
 }
 
 void remove_safely(entity e)
 {
     make_safe_for_remove(e);

-    remove_builtin(e);
+    builtin_remove(e);

 }
 
 void InitializeEntity(entity e, void(void) func, float order)
 }
 
 void InitializeEntity(entity e, void(void) func, float order)


@@ -1795,7 +1795,7 @@ void InitializeEntitiesRun()
         {
             entity e_old;
             e_old = self.enemy;
         {
             entity e_old;
             e_old = self.enemy;

-            remove_builtin(self);
+            builtin_remove(self);

             self = e_old;
         }
         //dprint("Delayed initialization: ", self.classname, "\n");
             self = e_old;
         }
         //dprint("Delayed initialization: ", self.classname, "\n");


@@ -1892,7 +1892,7 @@ void adaptor_think2use_hittype_splash() // for timed projectile detonation
 // deferred dropping
 void DropToFloor_Handler()
 {
 // deferred dropping
 void DropToFloor_Handler()
 {

-    droptofloor_builtin();
+    builtin_droptofloor();

     self.dropped_origin = self.origin;
 }
 
     self.dropped_origin = self.origin;
 }
 


@@ -3052,14 +3052,14 @@ float ExponentialFalloff(float mindist, float maxdist, float halflifedist, float
 
 
 #ifdef RELEASE
 
 
 #ifdef RELEASE

-#define cvar_string_normal cvar_string_builtin
-#define cvar_normal cvar_builtin
+#define cvar_string_normal builtin_cvar_string
+#define cvar_normal builtin_cvar

 #else
 string cvar_string_normal(string n)
 {
        if not(cvar_type(n) & 1)
                backtrace(strcat("Attempt to access undefined cvar: ", n));
 #else
 string cvar_string_normal(string n)
 {
        if not(cvar_type(n) & 1)
                backtrace(strcat("Attempt to access undefined cvar: ", n));

-       return cvar_string_builtin(n);
+       return builtin_cvar_string(n);

 }
 
 float cvar_normal(string n)
 }
 
 float cvar_normal(string n)


@@ -3067,7 +3067,7 @@ float cvar_normal(string n)
        return stof(cvar_string_normal(n));
 }
 #endif
        return stof(cvar_string_normal(n));
 }
 #endif

-#define cvar_set_normal cvar_set_builtin
+#define cvar_set_normal builtin_cvar_set

 
 void defer_think()
 {
 
 void defer_think()
 {