X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qh;h=e94ee9c6ca595927bb86e9a9cc93f48f925a9aaf;hp=1455054d2c5cad597ec87e84412d45b74ea6dc00;hb=c1c5a398025611690a8d7d6bd64219ccf452e673;hpb=2bddfb42fdbb3318aa319d228d8c99adcc90b128 diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 1455054d2c..e94ee9c6ca 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -11,24 +11,6 @@ #include #include -#ifdef RELEASE -#define cvar_string_normal builtin_cvar_string -#define cvar_normal builtin_cvar -#else -string cvar_string_normal(string n) -{ - if (!(cvar_type(n) & CVAR_TYPEFLAG_EXISTS)) - backtrace(strcat("Attempt to access undefined cvar: ", n)); - return builtin_cvar_string(n); -} - -float cvar_normal(string n) -{ - return stof(cvar_string_normal(n)); -} -#endif -#define cvar_set_normal builtin_cvar_set - .vector dropped_origin; entity eliminatedPlayers; @@ -62,6 +44,8 @@ void attach_sameorigin(entity e, entity to, string tag); void crosshair_trace(entity pl); void crosshair_trace_plusvisibletriggers(entity pl); +void WarpZone_crosshair_trace_plusvisibletriggers(entity pl); +void crosshair_trace_plusvisibletriggers__is_wz(entity pl, bool is_wz); void detach_sameorigin(entity e); @@ -72,12 +56,6 @@ string formatmessage(entity this, string msg); /** print(), but only print if the server is not local */ void dedicated_print(string input); -void GameLogEcho(string s); - -void GameLogInit(); - -void GameLogClose(); - void GetCvars(entity this, entity store, int f); string GetMapname(); @@ -88,7 +66,7 @@ float LostMovetypeFollow(entity ent); string uid2name(string myuid); -float MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundmax, float goodcontents, float badcontents, float badsurfaceflags, float attempts, float maxaboveground, float minviewdistance); +bool MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundmax, float goodcontents, float badcontents, float badsurfaceflags, int attempts, float maxaboveground, float minviewdistance); float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, float badsurfaceflags, float attempts, float maxaboveground, float minviewdistance); @@ -98,8 +76,6 @@ void play2(entity e, string filename); string playername(entity p, bool team_colorize); -void precache(); - void remove_safely(entity e); void remove_unsafely(entity e); @@ -131,9 +107,6 @@ void WarpZone_traceline_antilag (entity source, vector v1, vector v2, float nomo // copies a string to a tempstring (so one can strunzone it) string strcat1(string s) = #115; // FRIK_FILE -float logfile_open; -float logfile; - /* // NOTE: DO NOT USE THIS FUNCTION TOO OFTEN. // IT WILL MOST PROBABLY DESTROY _ALL_ OTHER TEMP @@ -324,17 +297,17 @@ void readlevelcvars() //#NO AUTOCVARS END -const float INITPRIO_FIRST = 0; -const float INITPRIO_GAMETYPE = 0; -const float INITPRIO_GAMETYPE_FALLBACK = 1; -const float INITPRIO_FINDTARGET = 10; -const float INITPRIO_DROPTOFLOOR = 20; -const float INITPRIO_SETLOCATION = 90; -const float INITPRIO_LINKDOORS = 91; -const float INITPRIO_LAST = 99; +const int INITPRIO_FIRST = 0; +const int INITPRIO_GAMETYPE = 0; +const int INITPRIO_GAMETYPE_FALLBACK = 1; +const int INITPRIO_FINDTARGET = 10; +const int INITPRIO_DROPTOFLOOR = 20; +const int INITPRIO_SETLOCATION = 90; +const int INITPRIO_LINKDOORS = 91; +const int INITPRIO_LAST = 99; .void(entity this) initialize_entity; -.float initialize_entity_order; +.int initialize_entity_order; .entity initialize_entity_next; entity initialize_entity_first; @@ -342,8 +315,8 @@ entity initialize_entity_first; -float sound_allowed(float dest, entity e); -void InitializeEntity(entity e, void(entity this) func, float order); +bool sound_allowed(int dest, entity e); +void InitializeEntity(entity e, void(entity this) func, int order); IntrusiveList g_ctrace_changed; STATIC_INIT(g_ctrace_changed) { g_ctrace_changed = IL_NEW(); }