X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=b4ed2d4d6ce129acff1ab53d17ce4aa26bd82002;hb=9a3b01ba5da2726001a5ed74645a15ce764a3675;hp=2354e128e30bd9d1874e1ca0e57c16ec2f8c07d2;hpb=1e85850478a0174700ab365d6a642a2a420d78f8;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 2354e128e..b4ed2d4d6 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -6,7 +6,6 @@ #include "g_hook.qh" #include "ipban.qh" #include "mutators/mutators_include.qh" -#include "tturrets/include/turrets_early.qh" #include "t_items.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" @@ -19,8 +18,8 @@ #include "../common/playerstats.qh" #include "../common/teams.qh" #include "../common/triggers/subs.qh" -#include "../common/urllib.qh" #include "../common/util.qh" +#include "../common/turrets/sv_turrets.qh" #include "../common/weapons/all.qh" #include "../csqcmodellib/sv_model.qh" #include "../warpzonelib/anglestransform.qh" @@ -63,8 +62,8 @@ void DistributeEvenly_Init(float amount, float totalweight) { if (DistributeEvenly_amount) { - dprint("DistributeEvenly_Init: UNFINISHED DISTRIBUTION (", ftos(DistributeEvenly_amount), " for "); - dprint(ftos(DistributeEvenly_totalweight), " left!)\n"); + LOG_TRACE("DistributeEvenly_Init: UNFINISHED DISTRIBUTION (", ftos(DistributeEvenly_amount), " for "); + LOG_TRACE(ftos(DistributeEvenly_totalweight), " left!)\n"); } if (totalweight == 0) DistributeEvenly_amount = 0; @@ -123,7 +122,7 @@ void GameLogEcho(string s) } if (autocvar_sv_eventlog_console) { - print(s, "\n"); + LOG_INFO(s, "\n"); } } @@ -196,9 +195,9 @@ entity findnearest(vector point, .string field, string value, vector axismod) { if (i != 0) { - dprint("Nearest point ("); - dprint(nearest_entity[0].netname); - dprint(") is not visible, using a visible one.\n"); + LOG_TRACE("Nearest point ("); + LOG_TRACE(nearest_entity[0].netname); + LOG_TRACE(") is not visible, using a visible one.\n"); } return nearest_entity[i]; } @@ -207,7 +206,7 @@ entity findnearest(vector point, .string field, string value, vector axismod) if (num_nearest == 0) return world; - dprint("Not seeing any location point, using nearest as fallback.\n"); + LOG_TRACE("Not seeing any location point, using nearest as fallback.\n"); /* DEBUGGING CODE: dprint("Candidates were: "); for(j = 0; j < num_nearest; ++j) @@ -242,16 +241,23 @@ string NearestLocation(vector p) } string formatmessage(string msg) -{ +{SELFPARAM(); float p, p1, p2; float n; vector cursor; entity cursor_ent; string escape; string replacement; + string ammoitems; p = 0; n = 7; + ammoitems = "batteries"; + if(self.items & ITEM_Plasma.m_itemid) ammoitems = ITEM_Plasma.m_name; + if(self.items & ITEM_Cells.m_itemid) ammoitems = ITEM_Cells.m_name; + if(self.items & ITEM_Rockets.m_itemid) ammoitems = ITEM_Rockets.m_name; + if(self.items & ITEM_Shells.m_itemid) ammoitems = ITEM_Shells.m_name; + WarpZone_crosshair_trace(self); cursor = trace_endpos; cursor_ent = trace_ent; @@ -278,45 +284,29 @@ string formatmessage(string msg) replacement = substring(msg, p, 2); escape = substring(msg, p + 1, 1); - if (escape == "%") - replacement = "%"; - else if (escape == "\\") - replacement = "\\"; - else if (escape == "n") - replacement = "\n"; - else if (escape == "a") - replacement = ftos(floor(self.armorvalue)); - else if (escape == "h") - replacement = ftos(floor(self.health)); - else if (escape == "l") - replacement = NearestLocation(self.origin); - else if (escape == "y") - replacement = NearestLocation(cursor); - else if (escape == "d") - replacement = NearestLocation(self.death_origin); - else if (escape == "w") { - float wep; - wep = self.weapon; - if (!wep) - wep = self.switchweapon; - if (!wep) - wep = self.cnt; - replacement = WEP_NAME(wep); - } else if (escape == "W") { - if (self.items & IT_SHELLS) replacement = "shells"; - else if (self.items & IT_NAILS) replacement = "bullets"; - else if (self.items & IT_ROCKETS) replacement = "rockets"; - else if (self.items & IT_CELLS) replacement = "cells"; - else if (self.items & IT_PLASMA) replacement = "plasma"; - else replacement = "batteries"; // ;) - } else if (escape == "x") { - replacement = cursor_ent.netname; - if (replacement == "" || !cursor_ent) - replacement = "nothing"; - } else if (escape == "s") - replacement = ftos(vlen(self.velocity - self.velocity.z * '0 0 1')); - else if (escape == "S") - replacement = ftos(vlen(self.velocity)); + switch(escape) + { + case "%": replacement = "%"; break; + case "\\":replacement = "\\"; break; + case "n": replacement = "\n"; break; + case "a": replacement = ftos(floor(self.armorvalue)); break; + case "h": replacement = ftos(floor(self.health)); break; + case "l": replacement = NearestLocation(self.origin); break; + case "y": replacement = NearestLocation(cursor); break; + case "d": replacement = NearestLocation(self.death_origin); break; + case "w": replacement = WEP_NAME((!self.weapon) ? (!self.switchweapon ? self.cnt : self.switchweapon) : self.weapon); break; + case "W": replacement = ammoitems; break; + case "x": replacement = ((cursor_ent.netname == "" || !cursor_ent) ? "nothing" : cursor_ent.netname); break; + case "s": replacement = ftos(vlen(self.velocity - self.velocity_z * '0 0 1')); break; + case "S": replacement = ftos(vlen(self.velocity)); break; + default: + { + MUTATOR_CALLHOOK(FormatMessage, escape, replacement, msg); + escape = format_escape; + replacement = format_replacement; + break; + } + } msg = strcat(substring(msg, 0, p), replacement, substring(msg, p+2, strlen(msg) - (p+2))); p = p + strlen(replacement); @@ -324,10 +314,6 @@ string formatmessage(string msg) return msg; } -float boolean(float value) { // if value is 0 return false (0), otherwise return true (1) - return (value == 0) ? false : true; -} - /* ============= GetCvars @@ -337,7 +323,7 @@ Called with: >0: receives a cvar from name=argv(f) value=argv(f+1) */ void GetCvars_handleString(string thisname, float f, .string field, string name) -{ +{SELFPARAM(); if (f < 0) { if (self.(field)) @@ -357,7 +343,7 @@ void GetCvars_handleString(string thisname, float f, .string field, string name) stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); } void GetCvars_handleString_Fixup(string thisname, float f, .string field, string name, string(string) func) -{ +{SELFPARAM(); GetCvars_handleString(thisname, f, field, name); if (f >= 0) // also initialize to the fitting value for "" when sending cvars out if (thisname == name) @@ -371,7 +357,7 @@ void GetCvars_handleString_Fixup(string thisname, float f, .string field, string } } void GetCvars_handleFloat(string thisname, float f, .float field, string name) -{ +{SELFPARAM(); if (f < 0) { } @@ -384,7 +370,7 @@ void GetCvars_handleFloat(string thisname, float f, .float field, string name) stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); } void GetCvars_handleFloatOnce(string thisname, float f, .float field, string name) -{ +{SELFPARAM(); if (f < 0) { } @@ -407,7 +393,7 @@ void GetCvars_handleFloatOnce(string thisname, float f, .float field, string nam } } string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(string wo) -{ +{SELFPARAM(); string o; o = W_FixWeaponOrder_ForceComplete(wo); if(self.weaponorder_byimpulse) @@ -419,7 +405,7 @@ string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(string wo) return o; } void GetCvars(float f) -{ +{SELFPARAM(); string s = string_null; if (f > 0) @@ -427,7 +413,6 @@ void GetCvars(float f) get_cvars_f = f; get_cvars_s = s; - MUTATOR_CALLHOOK(GetCvars); Notification_GetCvars(); @@ -490,16 +475,6 @@ string playername(entity p) return p.netname; } -vector randompos(vector m1, vector m2) -{ - vector v; - m2 = m2 - m1; - v.x = m2_x * random() + m1_x; - v.y = m2_y * random() + m1_y; - v.z = m2_z * random() + m1_z; - return v; -} - float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still needs done? { int i = weaponinfo.weapon; @@ -516,14 +491,14 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne d = false; } else if (g_cts) - d = (i == WEP_SHOTGUN); + d = (i == WEP_SHOTGUN.m_id); else if (g_nexball) d = 0; // weapon is set a few lines later else d = !(!weaponinfo.weaponstart); if(g_grappling_hook) // if possible, redirect off-hand hook to on-hand hook - d |= (i == WEP_HOOK); + d |= (i == WEP_HOOK.m_id); if(!g_cts && (weaponinfo.spawnflags & WEP_FLAG_MUTATORBLOCKED)) // never default mutator blocked guns d = 0; @@ -628,7 +603,7 @@ void readplayerstartcvars() } if (j > WEP_LAST) { - print("The weapon mutator list contains an unknown weapon ", s, ". Skipped.\n"); + LOG_INFO("The weapon mutator list contains an unknown weapon ", s, ". Skipped.\n"); } } g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3)); @@ -725,13 +700,13 @@ void readplayerstartcvars() } if (g_jetpack) - start_items |= IT_JETPACK; + start_items |= ITEM_Jetpack.m_itemid; MUTATOR_CALLHOOK(SetStartItems); - if ((start_items & IT_JETPACK) || (g_grappling_hook && (start_weapons & WEPSET_HOOK))) + if ((start_items & ITEM_Jetpack.m_itemid) || (g_grappling_hook && (start_weapons & WEPSET_HOOK))) { - start_items |= IT_FUEL_REGEN; + start_items |= ITEM_JetpackRegen.m_itemid; start_ammo_fuel = max(start_ammo_fuel, cvar("g_balance_fuel_rotstable")); warmup_start_ammo_fuel = max(warmup_start_ammo_fuel, cvar("g_balance_fuel_rotstable")); } @@ -787,14 +762,6 @@ float sound_allowed(float destin, entity e) return true; } -#undef sound -void sound(entity e, float chan, string samp, float vol, float attenu) -{ - if (!sound_allowed(MSG_BROADCAST, e)) - return; - sound7(e, chan, samp, vol, attenu, 0, 0); -} - void soundtoat(float _dest, entity e, vector o, float chan, string samp, float vol, float attenu) { float entno, idx; @@ -870,7 +837,7 @@ void stopsoundto(float _dest, entity e, float chan) if (entno >= 8192 || chan < 0 || chan > 7) { float idx, sflags; - idx = precache_sound_index("misc/null.wav"); + idx = precache_sound_index(SND(Null)); sflags = SND_LARGEENTITY; if (idx >= 256) sflags |= SND_LARGESOUND; @@ -918,7 +885,7 @@ float spamsound(entity e, float chan, string samp, float vol, float _atten) if (time > e.spamtime) { e.spamtime = time; - sound(e, chan, samp, vol, _atten); + _sound(e, chan, samp, vol, _atten); return true; } return false; @@ -943,7 +910,7 @@ void play2all(string samp) if (autocvar_bot_sound_monopoly) return; - sound(world, CH_INFO, samp, VOL_BASE, ATTEN_NONE); + _sound(world, CH_INFO, samp, VOL_BASE, ATTEN_NONE); } void PrecachePlayerSounds(string f); @@ -995,15 +962,8 @@ void precache_all_playermodels(string pattern) } void precache() -{ +{SELFPARAM(); // gamemode related things - precache_model ("models/misc/chatbubble.spr"); - precache_model("models/ice/ice.md3"); - -#ifdef TTURRETS_ENABLED - if (autocvar_g_turrets) - turrets_precash(); -#endif // Precache all player models if desired if (autocvar_sv_precacheplayermodels) @@ -1043,53 +1003,8 @@ void precache() } // gore and miscellaneous sounds - //precache_sound ("misc/h2ohit.wav"); - precache_model ("models/hook.md3"); - precache_sound ("misc/armorimpact.wav"); - precache_sound ("misc/bodyimpact1.wav"); - precache_sound ("misc/bodyimpact2.wav"); - precache_sound ("misc/gib.wav"); - precache_sound ("misc/gib_splat01.wav"); - precache_sound ("misc/gib_splat02.wav"); - precache_sound ("misc/gib_splat03.wav"); - precache_sound ("misc/gib_splat04.wav"); PrecacheGlobalSound((globalsound_fall = "misc/hitground 4")); PrecacheGlobalSound((globalsound_metalfall = "misc/metalhitground 4")); - precache_sound ("misc/null.wav"); - precache_sound ("misc/spawn.wav"); - precache_sound ("misc/talk.wav"); - precache_sound ("misc/teleport.wav"); - precache_sound ("misc/poweroff.wav"); - precache_sound ("player/lava.wav"); - precache_sound ("player/slime.wav"); - - precache_model ("models/sprites/0.spr32"); - precache_model ("models/sprites/1.spr32"); - precache_model ("models/sprites/2.spr32"); - precache_model ("models/sprites/3.spr32"); - precache_model ("models/sprites/4.spr32"); - precache_model ("models/sprites/5.spr32"); - precache_model ("models/sprites/6.spr32"); - precache_model ("models/sprites/7.spr32"); - precache_model ("models/sprites/8.spr32"); - precache_model ("models/sprites/9.spr32"); - precache_model ("models/sprites/10.spr32"); - - // common weapon precaches - precache_sound ("weapons/reload.wav"); // until weapons have individual reload sounds, precache the reload sound here - precache_sound ("weapons/weapon_switch.wav"); - precache_sound ("weapons/weaponpickup.wav"); - precache_sound ("weapons/unavailable.wav"); - precache_sound ("weapons/dryfire.wav"); - if (g_grappling_hook) - { - precache_sound ("weapons/hook_fire.wav"); // hook - precache_sound ("weapons/hook_impact.wav"); // hook - } - - precache_model("models/elaser.mdl"); - precache_model("models/laser.mdl"); - precache_model("models/ebomb.mdl"); #if 0 // Disabled this code because it simply does not work (e.g. ignores bgmvolume, overlaps with "cd loop" controlled tracks). @@ -1104,8 +1019,6 @@ void precache() ambientsound ('0 0 0', self.noise, VOL_BASE, ATTEN_NONE); } #endif - -#include "precache-for-csqc.inc" } @@ -1141,7 +1054,7 @@ void make_safe_for_remove(entity e) } void objerror(string s) -{ +{SELFPARAM(); make_safe_for_remove(self); builtin_objerror(s); } @@ -1174,10 +1087,8 @@ void InitializeEntity(entity e, void(void) func, float order) if (!e || e.initialize_entity) { // make a proxy initializer entity - entity e_old; - e_old = e; - e = spawn(); - e.classname = "initialize_entity"; + entity e_old = e; + e = new(initialize_entity); e.enemy = e_old; } @@ -1203,52 +1114,49 @@ void InitializeEntity(entity e, void(void) func, float order) } } void InitializeEntitiesRun() -{ - entity startoflist; - startoflist = initialize_entity_first; - initialize_entity_first = world; +{SELFPARAM(); + entity startoflist = initialize_entity_first; + initialize_entity_first = NULL; remove = remove_except_protected; - for (self = startoflist; self; self = self.initialize_entity_next) + for (entity e = startoflist; e; e = e.initialize_entity_next) { - self.remove_except_protected_forbidden = 1; + e.remove_except_protected_forbidden = 1; } - for (self = startoflist; self; ) + for (entity e = startoflist; e; ) { - entity e; - var void(void) func; - e = self.initialize_entity_next; - func = self.initialize_entity; - self.initialize_entity_order = 0; - self.initialize_entity = func_null; - self.initialize_entity_next = world; - self.remove_except_protected_forbidden = 0; - if (self.classname == "initialize_entity") + e.remove_except_protected_forbidden = 0; + e.initialize_entity_order = 0; + entity next = e.initialize_entity_next; + e.initialize_entity_next = NULL; + var void() func = e.initialize_entity; + e.initialize_entity = func_null; + if (e.classname == "initialize_entity") + { + entity wrappee = e.enemy; + builtin_remove(e); + e = wrappee; + } + //dprint("Delayed initialization: ", e.classname, "\n"); + if (func) { - entity e_old; - e_old = self.enemy; - builtin_remove(self); - self = e_old; + WITH(entity, self, e, func()); } - //dprint("Delayed initialization: ", self.classname, "\n"); - if(func) - func(); else { - eprint(self); - backtrace(strcat("Null function in: ", self.classname, "\n")); + eprint(e); + backtrace(strcat("Null function in: ", e.classname, "\n")); } - self = e; + e = next; } remove = remove_unsafely; } void UncustomizeEntitiesRun() -{ - entity oldself; - oldself = self; - for (self = world; (self = findfloat(self, uncustomizeentityforclient_set, 1)); ) - self.uncustomizeentityforclient(); - self = oldself; +{SELFPARAM(); + for (entity e = NULL; (e = findfloat(e, uncustomizeentityforclient_set, 1)); ) + { + WITH(entity, self, e, e.uncustomizeentityforclient()); + } } void SetCustomizer(entity e, float(void) customizer, void(void) uncustomizer) { @@ -1258,7 +1166,7 @@ void SetCustomizer(entity e, float(void) customizer, void(void) uncustomizer) } void Net_LinkEntity(entity e, bool docull, float dt, bool(entity, int) sendfunc) -{ +{SELFPARAM(); vector mi, ma; if (e.classname == "") @@ -1268,7 +1176,7 @@ void Net_LinkEntity(entity e, bool docull, float dt, bool(entity, int) sendfunc) { mi = e.mins; ma = e.maxs; - setmodel(e, "null"); + setmodel(e, MDL_Null); setsize(e, mi, ma); } @@ -1323,7 +1231,7 @@ void EliminatedPlayers_Init(float(entity) isEliminated_func) void adaptor_think2touch() -{ +{SELFPARAM(); entity o; o = other; other = world; @@ -1332,7 +1240,7 @@ void adaptor_think2touch() } void adaptor_think2use() -{ +{SELFPARAM(); entity o, a; o = other; a = activator; @@ -1344,7 +1252,7 @@ void adaptor_think2use() } void adaptor_think2use_hittype_splash() // for timed projectile detonation -{ +{SELFPARAM(); if(!(self.flags & FL_ONGROUND)) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING self.projectiledeathtype |= HITTYPE_SPLASH; adaptor_think2use(); @@ -1352,13 +1260,13 @@ void adaptor_think2use_hittype_splash() // for timed projectile detonation // deferred dropping void DropToFloor_Handler() -{ +{SELFPARAM(); builtin_droptofloor(); self.dropped_origin = self.origin; } void droptofloor() -{ +{SELFPARAM(); InitializeEntity(self, DropToFloor_Handler, INITPRIO_DROPTOFLOOR); } @@ -1414,7 +1322,7 @@ float tracebox_hits_box(vector start, vector mi, vector ma, vector end, vector t } float SUB_NoImpactCheck() -{ +{SELFPARAM(); // zero hitcontents = this is not the real impact, but either the // mirror-impact of something hitting the projectile instead of the // projectile hitting the something, or a touchareagrid one. Neither of @@ -1422,7 +1330,7 @@ float SUB_NoImpactCheck() if(trace_dphitcontents == 0) { //dprint("A hit happened with zero hit contents... DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct.\n"); - dprintf("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.origin)); + LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Profectile will self-destruct. (edict: %d, classname: %s, origin: %s)\n", num_for_edict(self), self.classname, vtos(self.origin)); checkclient(); } if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) @@ -1435,11 +1343,11 @@ float SUB_NoImpactCheck() traceline(self.origin - tic, self.origin + tic, MOVE_NORMAL, self); if (trace_fraction >= 1) { - dprint("Odd... did not hit...?\n"); + LOG_TRACE("Odd... did not hit...?\n"); } else if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) { - dprint("Detected and prevented the sky-grapple bug.\n"); + LOG_TRACE("Detected and prevented the sky-grapple bug.\n"); return 1; } } @@ -1451,7 +1359,7 @@ float SUB_NoImpactCheck() void W_Crylink_Dequeue(entity e); float WarpZone_Projectile_Touch_ImpactFilter_Callback() -{ +{SELFPARAM(); if(SUB_OwnerCheck()) return true; if(SUB_NoImpactCheck()) @@ -1497,7 +1405,7 @@ void URI_Get_Callback(float id, float status, string data) } else { - print("Received HTTP request data for an invalid id ", ftos(id), ".\n"); + LOG_INFO("Received HTTP request data for an invalid id ", ftos(id), ".\n"); } } @@ -1626,7 +1534,7 @@ float MoveToRandomMapLocation(entity e, float goodcontents, float badcontents, f { setorigin(e, start); e.angles = vectoangles(end - start); - dprint("Needed ", ftos(i + 1), " attempts\n"); + LOG_TRACE("Needed ", ftos(i + 1), " attempts\n"); return true; } else @@ -1727,7 +1635,7 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float } vector shotorg_adjust(vector vecs, float y_is_right, float visual) -{ +{SELFPARAM(); return shotorg_adjust_values(vecs, y_is_right, visual, self.owner.cvar_cl_gunalign); } @@ -1817,7 +1725,7 @@ vector gettaginfo_relative(entity e, float tag) .float scale2; float modeleffect_SendEntity(entity to, int sf) -{ +{SELFPARAM(); float f; WriteByte(MSG_ENTITY, ENT_CLIENT_MODELEFFECT); @@ -1869,7 +1777,7 @@ void modeleffect_spawn(string m, float s, float f, vector o, vector v, vector an float sz; e = spawn(); e.classname = "modeleffect"; - setmodel(e, m); + _setmodel(e, m); e.frame = f; setorigin(e, o); e.velocity = v; @@ -1943,7 +1851,7 @@ void randombit_test(float bits, float iter) { while(iter > 0) { - print(ftos(randombit(bits)), "\n"); + LOG_INFO(ftos(randombit(bits)), "\n"); --iter; } } @@ -1959,33 +1867,6 @@ float ExponentialFalloff(float mindist, float maxdist, float halflifedist, float } -void defer_think() -{ - entity oself; - - oself = self; - self = self.owner; - oself.think = SUB_Remove; - oself.nextthink = time; - - oself.use(); -} - -/* - Execute func() after time + fdelay. - self when func is executed = self when defer is called -*/ -void defer(float fdelay, void() func) -{ - entity e; - - e = spawn(); - e.owner = self; - e.use = func; - e.think = defer_think; - e.nextthink = time + fdelay; -} - .string aiment_classname; .float aiment_deadflag; void SetMovetypeFollow(entity ent, entity e) @@ -2025,10 +1906,12 @@ float LostMovetypeFollow(entity ent) float isPushable(entity e) { - if(e.iscreature) - return true; if(e.pushable) return true; + if(IS_VEHICLE(e)) + return false; + if(e.iscreature) + return true; switch(e.classname) { case "body":