X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=220ebc3af1c800006a7c34efd9641b12e5f8b758;hp=bcb8d02d9ab6ec23beba89330e80d7e703b99355;hb=cd4892b9fcd32bd4887f0b3bc2503894520945c7;hpb=c606e5f848ffb0a2e92d7fb471a9f8b9e3cbfe97 diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index bcb8d02d9..220ebc3af 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -4,13 +4,14 @@ #include "constants.qh" #include "g_hook.qh" #include "ipban.qh" -#include "mutators/all.qh" +#include "mutators/_mod.qh" #include "../common/t_items.qh" #include "weapons/accuracy.qh" #include "weapons/csqcprojectile.qh" #include "weapons/selection.qh" -#include "../common/command/generic.qh" +#include "../common/command/_mod.qh" #include "../common/constants.qh" +#include #include "../common/deathtypes/all.qh" #include "../common/mapinfo.qh" #include "../common/notifications/all.qh" @@ -19,12 +20,13 @@ #include "../common/triggers/subs.qh" #include "../common/util.qh" #include "../common/turrets/sv_turrets.qh" -#include "../common/weapons/all.qh" +#include #include "../common/vehicles/sv_vehicles.qh" #include "../common/vehicles/vehicle.qh" -#include "../common/items/all.qc" +#include "../common/items/_mod.qh" #include "../common/state.qh" #include "../common/effects/qc/globalsound.qh" +#include "../common/wepent.qh" #include "../lib/csqcmodel/sv_model.qh" #include "../lib/warpzone/anglestransform.qh" #include "../lib/warpzone/server.qh" @@ -33,20 +35,25 @@ void crosshair_trace(entity pl) { traceline_antilag(pl, pl.cursor_trace_start, pl.cursor_trace_start + normalize(pl.cursor_trace_endpos - pl.cursor_trace_start) * MAX_SHOT_DISTANCE, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl)); } +.bool ctrace_solidchanged; void crosshair_trace_plusvisibletriggers(entity pl) { - entity first; - entity e; - first = findchainfloat(solid, SOLID_TRIGGER); - - for (e = first; e; e = e.chain) - if (e.model != "") - e.solid = SOLID_BSP; + FOREACH_ENTITY_FLOAT(solid, SOLID_TRIGGER, + { + if(it.model != "") + { + it.solid = SOLID_BSP; + it.ctrace_solidchanged = true; + } + }); crosshair_trace(pl); - for (e = first; e; e = e.chain) - e.solid = SOLID_TRIGGER; + FOREACH_ENTITY_FLOAT(ctrace_solidchanged, true, + { + it.solid = SOLID_TRIGGER; + it.ctrace_solidchanged = false; + }); } void WarpZone_crosshair_trace(entity pl) { @@ -92,7 +99,7 @@ void GameLogEcho(string s) } if (autocvar_sv_eventlog_console) { - LOG_INFO(s, "\n"); + dedicated_print(strcat(s, "\n")); } } @@ -122,7 +129,7 @@ entity findnearest(vector point, .string field, string value, vector axismod) float num_nearest; num_nearest = 0; - localhead = find(world, field, value); + localhead = find(NULL, field, value); while (localhead) { if ((localhead.items == IT_KEY1 || localhead.items == IT_KEY2) && localhead.target == "###item###") @@ -160,23 +167,23 @@ entity findnearest(vector point, .string field, string value, vector axismod) // now use the first one from our list that we can see for (i = 0; i < num_nearest; ++i) { - traceline(point, nearest_entity[i].origin, true, world); + traceline(point, nearest_entity[i].origin, true, NULL); if (trace_fraction == 1) { if (i != 0) { LOG_TRACE("Nearest point ("); LOG_TRACE(nearest_entity[0].netname); - LOG_TRACE(") is not visible, using a visible one.\n"); + LOG_TRACE(") is not visible, using a visible one."); } return nearest_entity[i]; } } if (num_nearest == 0) - return world; + return NULL; - LOG_TRACE("Not seeing any location point, using nearest as fallback.\n"); + LOG_TRACE("Not seeing any location point, using nearest as fallback."); /* DEBUGGING CODE: dprint("Candidates were: "); for(j = 0; j < num_nearest; ++j) @@ -254,6 +261,8 @@ string formatmessage(entity this, string msg) replacement = substring(msg, p, 2); escape = substring(msg, p + 1, 1); + .entity weaponentity = weaponentities[0]; // TODO: unhardcode + switch(escape) { case "%": replacement = "%"; break; @@ -264,7 +273,7 @@ string formatmessage(entity this, string msg) case "l": replacement = NearestLocation(this.origin); break; case "y": replacement = NearestLocation(cursor); break; case "d": replacement = NearestLocation(this.death_origin); break; - case "w": replacement = ((PS(this).m_weapon == WEP_Null) ? ((PS(this).m_switchweapon == WEP_Null) ? Weapons_from(this.cnt) : PS(this).m_switchweapon) : PS(this).m_weapon).m_name; break; + case "w": replacement = ((this.(weaponentity).m_weapon == WEP_Null) ? ((this.(weaponentity).m_switchweapon == WEP_Null) ? Weapons_from(this.(weaponentity).cnt) : this.(weaponentity).m_switchweapon) : this.(weaponentity).m_weapon).m_name; break; case "W": replacement = ammoitems; break; case "x": replacement = ((cursor_ent.netname == "" || !cursor_ent) ? "nothing" : cursor_ent.netname); break; case "s": replacement = ftos(vlen(this.velocity - this.velocity_z * '0 0 1')); break; @@ -274,8 +283,7 @@ string formatmessage(entity this, string msg) default: { MUTATOR_CALLHOOK(FormatMessage, this, escape, replacement, msg); - escape = format_escape; - replacement = format_replacement; + replacement = M_ARGV(2, string); break; } } @@ -294,55 +302,55 @@ Called with: 0: sends the request >0: receives a cvar from name=argv(f) value=argv(f+1) */ -void GetCvars_handleString(string thisname, float f, .string field, string name) -{SELFPARAM(); +void GetCvars_handleString(entity this, string thisname, float f, .string field, string name) +{ if (f < 0) { - if (self.(field)) - strunzone(self.(field)); - self.(field) = string_null; + if (this.(field)) + strunzone(this.(field)); + this.(field) = string_null; } else if (f > 0) { if (thisname == name) { - if (self.(field)) - strunzone(self.(field)); - self.(field) = strzone(argv(f + 1)); + if (this.(field)) + strunzone(this.(field)); + this.(field) = strzone(argv(f + 1)); } } else - stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); + stuffcmd(this, 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); +void GetCvars_handleString_Fixup(entity this, string thisname, float f, .string field, string name, string(entity, string) func) +{ + GetCvars_handleString(this, thisname, f, field, name); if (f >= 0) // also initialize to the fitting value for "" when sending cvars out if (thisname == name) { - string s = func(strcat1(self.(field))); - if (s != self.(field)) + string s = func(this, strcat1(this.(field))); + if (s != this.(field)) { - strunzone(self.(field)); - self.(field) = strzone(s); + strunzone(this.(field)); + this.(field) = strzone(s); } } } -void GetCvars_handleFloat(string thisname, float f, .float field, string name) -{SELFPARAM(); +void GetCvars_handleFloat(entity this, string thisname, float f, .float field, string name) +{ if (f < 0) { } else if (f > 0) { if (thisname == name) - self.(field) = stof(argv(f + 1)); + this.(field) = stof(argv(f + 1)); } else - stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); + stuffcmd(this, strcat("cl_cmd sendcvar ", name, "\n")); } -void GetCvars_handleFloatOnce(string thisname, float f, .float field, string name) -{SELFPARAM(); +void GetCvars_handleFloatOnce(entity this, string thisname, float f, .float field, string name) +{ if (f < 0) { } @@ -350,30 +358,30 @@ void GetCvars_handleFloatOnce(string thisname, float f, .float field, string nam { if (thisname == name) { - if (!self.(field)) + if (!this.(field)) { - self.(field) = stof(argv(f + 1)); - if (!self.(field)) - self.(field) = -1; + this.(field) = stof(argv(f + 1)); + if (!this.(field)) + this.(field) = -1; } } } else { - if (!self.(field)) - stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n")); + if (!this.(field)) + stuffcmd(this, strcat("cl_cmd sendcvar ", name, "\n")); } } -string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(string wo) -{SELFPARAM(); +string W_FixWeaponOrder_ForceComplete_AndBuildImpulseList(entity this, string wo) +{ string o; o = W_FixWeaponOrder_ForceComplete(wo); - if(self.weaponorder_byimpulse) + if(this.weaponorder_byimpulse) { - strunzone(self.weaponorder_byimpulse); - self.weaponorder_byimpulse = string_null; + strunzone(this.weaponorder_byimpulse); + this.weaponorder_byimpulse = string_null; } - self.weaponorder_byimpulse = strzone(W_FixWeaponOrder_BuildImpulseList(o)); + this.weaponorder_byimpulse = strzone(W_FixWeaponOrder_BuildImpulseList(o)); return o; } @@ -421,31 +429,38 @@ void GetCvars(entity this, int f) get_cvars_s = s; MUTATOR_CALLHOOK(GetCvars); - Notification_GetCvars(); + Notification_GetCvars(this); ReplicateVars(this, s, f); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[2], "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[3], "cl_weaponpriority3", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[4], "cl_weaponpriority4", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[5], "cl_weaponpriority5", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[6], "cl_weaponpriority6", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[7], "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleString_Fixup(s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[2], "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[3], "cl_weaponpriority3", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[4], "cl_weaponpriority4", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[5], "cl_weaponpriority5", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[6], "cl_weaponpriority6", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[7], "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete); + GetCvars_handleString_Fixup(this, s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete); - GetCvars_handleFloat(s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking"); + GetCvars_handleFloat(this, s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking"); // fixup of switchweapon (needed for LMS or when spectating is disabled, as PutClientInServer comes too early) if (f > 0) { if (s == "cl_weaponpriority") - if (PS(self)) PS(self).m_switchweapon = w_getbestweapon(self); + { + for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot) + { + .entity weaponentity = weaponentities[slot]; + if (this.(weaponentity) && (this.(weaponentity).m_weapon != WEP_Null || slot == 0)) + this.(weaponentity).m_switchweapon = w_getbestweapon(this, weaponentity); + } + } if (s == "cl_allow_uidtracking") - PlayerStats_GameReport_AddPlayer(self); + PlayerStats_GameReport_AddPlayer(this); } } @@ -472,9 +487,9 @@ float want_weapon(entity weaponinfo, float allguns) // WEAPONTODO: what still ne return 0; bool mutator_returnvalue = MUTATOR_CALLHOOK(WantWeapon, weaponinfo, d, allguns, allow_mutatorblocked); - d = ret_float; - allguns = want_allguns; - allow_mutatorblocked = false; + d = M_ARGV(1, float); + allguns = M_ARGV(2, bool); + allow_mutatorblocked = M_ARGV(3, bool); if(allguns) { @@ -529,7 +544,7 @@ void readplayerstartcvars() s = cvar_string("g_weaponarena"); MUTATOR_CALLHOOK(SetWeaponArena, s); - s = ret_string; + s = M_ARGV(0, string); if (s == "0" || s == "") { @@ -780,14 +795,14 @@ void precache() #if 0 // Disabled this code because it simply does not work (e.g. ignores bgmvolume, overlaps with "cd loop" controlled tracks). - if (!self.noise && self.music) // quake 3 uses the music field - self.noise = self.music; + if (!this.noise && this.music) // quake 3 uses the music field + this.noise = this.music; // plays music for the level if there is any - if (self.noise) + if (this.noise) { - precache_sound (self.noise); - ambientsound ('0 0 0', self.noise, VOL_BASE, ATTEN_NONE); + precache_sound (this.noise); + ambientsound ('0 0 0', this.noise, VOL_BASE, ATTEN_NONE); } #endif } @@ -797,7 +812,7 @@ void make_safe_for_remove(entity e) { if (e.initialize_entity) { - entity ent, prev = world; + entity ent, prev = NULL; for (ent = initialize_entity_first; ent; ) { if ((ent == e) || ((ent.classname == "initialize_entity") && (ent.enemy == e))) @@ -824,12 +839,6 @@ void make_safe_for_remove(entity e) } } -void objerror(string s) -{SELFPARAM(); - make_safe_for_remove(self); - builtin_objerror(s); -} - .float remove_except_protected_forbidden; void remove_except_protected(entity e) { @@ -867,7 +876,7 @@ void InitializeEntity(entity e, void(entity this) func, float order) e.initialize_entity_order = order; cur = initialize_entity_first; - prev = world; + prev = NULL; for (;;) { if (!cur || cur.initialize_entity_order > order) @@ -888,7 +897,7 @@ void InitializeEntitiesRun() { entity startoflist = initialize_entity_first; initialize_entity_first = NULL; - remove = remove_except_protected; + delete_fn = remove_except_protected; for (entity e = startoflist; e; e = e.initialize_entity_next) { e.remove_except_protected_forbidden = 1; @@ -910,7 +919,7 @@ void InitializeEntitiesRun() //dprint("Delayed initialization: ", e.classname, "\n"); if (func) { - WITHSELF(e, func(e)); + func(e); } else { @@ -919,7 +928,7 @@ void InitializeEntitiesRun() } e = next; } - remove = remove_unsafely; + delete_fn = remove_unsafely; } .float(entity) isEliminated; @@ -964,7 +973,7 @@ void adaptor_think2use_hittype_splash(entity this) // for timed projectile deton { if(!(IS_ONGROUND(this))) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING this.projectiledeathtype |= HITTYPE_SPLASH; - WITHSELF(this, adaptor_think2use(this)); + adaptor_think2use(this); } // deferred dropping @@ -1038,13 +1047,12 @@ bool SUB_NoImpactCheck(entity this, entity toucher) // these stop the projectile from moving, so... 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"); - 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", etof(this), this.classname, vtos(this.origin)); - WITHSELF(this, checkclient()); + LOG_TRACEF("A hit from a projectile happened with no hit contents! DEBUG THIS, this should never happen for projectiles! Projectile will self-destruct. (edict: %i, classname: %s, origin: %v)", this, this.classname, this.origin); + checkclient(this); } if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) return true; - if (toucher == world && this.size != '0 0 0') + if (toucher == NULL && this.size != '0 0 0') { vector tic; tic = this.velocity * sys_frametime; @@ -1052,11 +1060,11 @@ bool SUB_NoImpactCheck(entity this, entity toucher) traceline(this.origin - tic, this.origin + tic, MOVE_NORMAL, this); if (trace_fraction >= 1) { - LOG_TRACE("Odd... did not hit...?\n"); + LOG_TRACE("Odd... did not hit...?"); } else if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT) { - LOG_TRACE("Detected and prevented the sky-grapple bug.\n"); + LOG_TRACE("Detected and prevented the sky-grapple bug."); return true; } } @@ -1076,14 +1084,14 @@ bool WarpZone_Projectile_Touch_ImpactFilter_Callback(entity this, entity toucher if(this.classname == "nade") return false; // no checks here else if(this.classname == "grapplinghook") - RemoveGrapplingHook(this.realowner); + RemoveHook(this); else if(this.classname == "spike") { W_Crylink_Dequeue(this); - remove(this); + delete(this); } else - remove(this); + delete(this); return true; } if(trace_ent && trace_ent.solid > SOLID_TRIGGER) @@ -1147,7 +1155,6 @@ float MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundma { float m, i; vector start, org, delta, end, enddown, mstart; - entity sp; m = e.dphitcontentsmask; e.dphitcontentsmask = goodcontents | badcontents; @@ -1203,16 +1210,26 @@ float MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundma continue; // rule 4: we must "see" some spawnpoint or item - for(sp = world; (sp = find(sp, classname, "info_player_deathmatch")); ) - if(checkpvs(mstart, sp)) - if((traceline(mstart, sp.origin, MOVE_NORMAL, e), trace_fraction) >= 1) - break; + entity sp = NULL; + IL_EACH(g_spawnpoints, checkpvs(mstart, it), + { + if((traceline(mstart, it.origin, MOVE_NORMAL, e), trace_fraction) >= 1) + { + sp = it; + break; + } + }); if(!sp) { - for(sp = world; (sp = findflags(sp, flags, FL_ITEM)); ) - if(checkpvs(mstart, sp)) - if((traceline(mstart, sp.origin + (sp.mins + sp.maxs) * 0.5, MOVE_NORMAL, e), trace_fraction) >= 1) - break; + IL_EACH(g_items, checkpvs(mstart, it), + { + if((traceline(mstart, it.origin + (it.mins + it.maxs) * 0.5, MOVE_NORMAL, e), trace_fraction) >= 1) + { + sp = it; + break; + } + }); + if(!sp) continue; } @@ -1247,7 +1264,7 @@ float MoveToRandomLocationWithinBounds(entity e, vector boundmin, vector boundma { setorigin(e, start); e.angles = vectoangles(end - start); - LOG_TRACE("Needed ", ftos(i + 1), " attempts\n"); + LOG_TRACE("Needed ", ftos(i + 1), " attempts"); return true; } else @@ -1320,13 +1337,13 @@ void detach_sameorigin(entity e) else e.angles = AnglesTransform_ToAngles(e.angles); setorigin(e, org); - setattachment(e, world, ""); + setattachment(e, NULL, ""); setorigin(e, e.origin); } void follow_sameorigin(entity e, entity to) { - e.movetype = MOVETYPE_FOLLOW; // make the hole follow + set_movetype(e, MOVETYPE_FOLLOW); // make the hole follow e.aiment = to; // make the hole follow bmodel e.punchangle = to.angles; // the original angles of bmodel e.view_ofs = e.origin - to.origin; // relative origin @@ -1335,7 +1352,7 @@ void follow_sameorigin(entity e, entity to) void unfollow_sameorigin(entity e) { - e.movetype = MOVETYPE_NONE; + set_movetype(e, MOVETYPE_NONE); } entity gettaginfo_relative_ent; @@ -1357,7 +1374,7 @@ vector gettaginfo_relative(entity e, float tag) void SetMovetypeFollow(entity ent, entity e) { // FIXME this may not be warpzone aware - ent.movetype = MOVETYPE_FOLLOW; // make the hole follow + set_movetype(ent, MOVETYPE_FOLLOW); // make the hole follow ent.solid = SOLID_NOT; // MOVETYPE_FOLLOW is always non-solid - this means this cannot be teleported by warpzones any more! Instead, we must notice when our owner gets teleported. ent.aiment = e; // make the hole follow bmodel ent.punchangle = e.angles; // the original angles of bmodel @@ -1368,14 +1385,14 @@ void SetMovetypeFollow(entity ent, entity e) } void UnsetMovetypeFollow(entity ent) { - ent.movetype = MOVETYPE_FLY; + set_movetype(ent, MOVETYPE_FLY); PROJECTILE_MAKETRIGGER(ent); - ent.aiment = world; + ent.aiment = NULL; } float LostMovetypeFollow(entity ent) { /* - if(ent.movetype != MOVETYPE_FOLLOW) + if(ent.move_movetype != MOVETYPE_FOLLOW) if(ent.aiment) error("???"); */