MUTATOR_ADD(mutator_rocketflying);
if(cvar("g_vampire"))
MUTATOR_ADD(mutator_vampire);
+ if(cvar("g_spawn_near_teammate"))
+ MUTATOR_ADD(mutator_spawn_near_teammate);
+
+ // is this a mutator? is this a mode?
if(cvar("g_sandbox"))
MUTATOR_ADD(sandbox);
}
#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;
- sound_builtin(e, chan, samp, vol, atten);
+ builtin_sound(e, chan, samp, vol, atten);
}
#else
#undef sound
void objerror(string s)
{
make_safe_for_remove(self);
- objerror_builtin(s);
+ builtin_objerror(s);
}
.float remove_except_protected_forbidden;
{
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");
- remove_builtin(e);
+ builtin_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)
{
entity e_old;
e_old = self.enemy;
- remove_builtin(self);
+ builtin_remove(self);
self = e_old;
}
//dprint("Delayed initialization: ", self.classname, "\n");
// deferred dropping
void DropToFloor_Handler()
{
- droptofloor_builtin();
+ builtin_droptofloor();
self.dropped_origin = self.origin;
}
#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));
- return cvar_string_builtin(n);
+ return builtin_cvar_string(n);
}
float cvar_normal(string n)
return stof(cvar_string_normal(n));
}
#endif
-#define cvar_set_normal cvar_set_builtin
+#define cvar_set_normal builtin_cvar_set
void defer_think()
{