X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qh;h=a8304b0e3aff44fa74e91510d4c82b7f1e042332;hb=b2e9e85b747835df6898c20797624b24470ed383;hp=4193ff29add7c5bd7fd357c9862a3faaa85d0ef3;hpb=317ec3eb27ada1c4668876e9499136125acb7984;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh index 4193ff29a..a8304b0e3 100644 --- a/qcsrc/server/miscfunctions.qh +++ b/qcsrc/server/miscfunctions.qh @@ -1,13 +1,12 @@ -#ifndef MISCFUNCTIONS_H -#define MISCFUNCTIONS_H +#pragma once -#include "t_items.qh" +#include #include "mutators/events.qh" -#include "../common/constants.qh" -#include "../common/mapinfo.qh" -#include "../common/turrets/all.qh" +#include +#include +#include #ifdef RELEASE #define cvar_string_normal builtin_cvar_string @@ -41,11 +40,11 @@ void play2all(string samp); void play2team(float t, string filename); -void GetCvars_handleFloat(string thisname, float f, .float field, string name); +void GetCvars_handleFloat(entity this, string thisname, float f, .float field, string name); float spamsound(entity e, float chan, string samp, float vol, float _atten); -void GetCvars_handleString(string thisname, float f, .string field, string name); +void GetCvars_handleString(entity this, string thisname, float f, .string field, string name); void precache_all_playermodels(string pattern); @@ -56,9 +55,7 @@ void InitializeEntitiesRun(); void stopsoundto(float _dest, entity e, float chan); void soundtoat(float _dest, entity e, vector o, float chan, string samp, float vol, float _atten); -void objerror(string s); -void droptofloor(); -void() SUB_Remove; +void droptofloor(entity this); void attach_sameorigin(entity e, entity to, string tag); @@ -70,7 +67,7 @@ void detach_sameorigin(entity e); void follow_sameorigin(entity e, entity to); -string formatmessage(string msg); +string formatmessage(entity this, string msg); void GameLogEcho(string s); @@ -78,7 +75,7 @@ void GameLogInit(); void GameLogClose(); -void GetCvars(float f); +void GetCvars(entity this, float f); string GetMapname(); @@ -118,11 +115,13 @@ void WarpZone_crosshair_trace(entity pl); void WarpZone_traceline_antilag (entity source, vector v1, vector v2, float nomonst, entity forent, float lag); +#define IS_DEAD(s) ((s).deadflag != DEAD_NO) + #define ITEM_TOUCH_NEEDKILL() (((trace_dpstartcontents | trace_dphitcontents) & DPCONTENTS_NODROP) || (trace_dphitq3surfaceflags & Q3SURFACEFLAG_SKY)) #define ITEM_DAMAGE_NEEDKILL(dt) (((dt) == DEATH_HURTTRIGGER.m_id) || ((dt) == DEATH_SLIME.m_id) || ((dt) == DEATH_LAVA.m_id) || ((dt) == DEATH_SWAMP.m_id)) -#define PROJECTILE_TOUCH if(WarpZone_Projectile_Touch()) return +#define PROJECTILE_TOUCH(this) MACRO_BEGIN if (WarpZone_Projectile_Touch(this)) return; MACRO_END #define CENTER_OR_VIEWOFS(ent) (ent.origin + (IS_PLAYER(ent) ? ent.view_ofs : ((ent.mins + ent.maxs) * 0.5))) @@ -132,13 +131,12 @@ string strcat1(string s) = #115; // FRIK_FILE float logfile_open; float logfile; -#define strstr strstrofs /* // NOTE: DO NOT USE THIS FUNCTION TOO OFTEN. // IT WILL MOST PROBABLY DESTROY _ALL_ OTHER TEMP // STRINGS AND TAKE QUITE LONG. haystack and needle MUST // BE CONSTANT OR strzoneD! -float strstr(string haystack, string needle, float offset) +float strstrofs(string haystack, string needle, float offset) { float len, endpos; string found; @@ -241,22 +239,6 @@ float g_weapon_stay; float want_weapon(entity weaponinfo, float allguns); // WEAPONTODO: what still needs done? void readplayerstartcvars(); -float g_bugrigs; -float g_bugrigs_planar_movement; -float g_bugrigs_planar_movement_car_jumping; -float g_bugrigs_reverse_spinning; -float g_bugrigs_reverse_speeding; -float g_bugrigs_reverse_stopping; -float g_bugrigs_air_steering; -float g_bugrigs_angle_smoothing; -float g_bugrigs_friction_floor; -float g_bugrigs_friction_brake; -float g_bugrigs_friction_air; -float g_bugrigs_accel; -float g_bugrigs_speed_ref; -float g_bugrigs_speed_pow; -float g_bugrigs_steer; - float sv_autotaunt; float sv_taunt; @@ -266,22 +248,6 @@ void readlevelcvars() if(cvar("sv_allow_fullbright")) serverflags |= SERVERFLAG_ALLOW_FULLBRIGHT; - g_bugrigs = cvar("g_bugrigs"); - g_bugrigs_planar_movement = cvar("g_bugrigs_planar_movement"); - g_bugrigs_planar_movement_car_jumping = cvar("g_bugrigs_planar_movement_car_jumping"); - g_bugrigs_reverse_spinning = cvar("g_bugrigs_reverse_spinning"); - g_bugrigs_reverse_speeding = cvar("g_bugrigs_reverse_speeding"); - g_bugrigs_reverse_stopping = cvar("g_bugrigs_reverse_stopping"); - g_bugrigs_air_steering = cvar("g_bugrigs_air_steering"); - g_bugrigs_angle_smoothing = cvar("g_bugrigs_angle_smoothing"); - g_bugrigs_friction_floor = cvar("g_bugrigs_friction_floor"); - g_bugrigs_friction_brake = cvar("g_bugrigs_friction_brake"); - g_bugrigs_friction_air = cvar("g_bugrigs_friction_air"); - g_bugrigs_accel = cvar("g_bugrigs_accel"); - g_bugrigs_speed_ref = cvar("g_bugrigs_speed_ref"); - g_bugrigs_speed_pow = cvar("g_bugrigs_speed_pow"); - g_bugrigs_steer = cvar("g_bugrigs_steer"); - g_instagib = cvar("g_instagib"); sv_clones = cvar("sv_clones"); @@ -294,7 +260,7 @@ void readlevelcvars() sv_taunt = cvar("sv_taunt"); warmup_stage = cvar("g_warmup"); - g_warmup_limit = cvar("g_warmup_limit"); + warmup_limit = cvar("g_warmup_limit"); g_warmup_allguns = cvar("g_warmup_allguns"); g_warmup_allow_timeout = cvar("g_warmup_allow_timeout"); @@ -372,10 +338,7 @@ void readlevelcvars() if (!warmup_stage) game_starttime = time + cvar("g_start_delay"); - for(int i = WEP_FIRST; i <= WEP_LAST; ++i) { - Weapon w = get_weaponinfo(i); - w.wr_init(w); - } + FOREACH(Weapons, it != WEP_Null, LAMBDA(it.wr_init(it))); readplayerstartcvars(); } @@ -391,7 +354,7 @@ const float INITPRIO_SETLOCATION = 90; const float INITPRIO_LINKDOORS = 91; const float INITPRIO_LAST = 99; -.void() initialize_entity; +.void(entity this) initialize_entity; .float initialize_entity_order; .entity initialize_entity_next; entity initialize_entity_first; @@ -401,7 +364,4 @@ entity initialize_entity_first; float sound_allowed(float dest, entity e); -void InitializeEntity(entity e, void() func, float order); -void SetCustomizer(entity e, float() customizer, void() uncustomizer); - -#endif +void InitializeEntity(entity e, void(entity this) func, float order);