#include "miscfunctions.qh"
+
#include "antilag.qh"
#include "command/common.qh"
#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 <common/net_linked.qh>
#include "../common/deathtypes/all.qh"
#include "../common/mapinfo.qh"
#include "../common/notifications/all.qh"
#include "../common/triggers/subs.qh"
#include "../common/util.qh"
#include "../common/turrets/sv_turrets.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
#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"
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));
+ traceline_antilag(pl, CS(pl).cursor_trace_start, CS(pl).cursor_trace_start + normalize(CS(pl).cursor_trace_endpos - CS(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;
+ IL_PUSH(g_ctrace_changed, it);
+ }
+ });
crosshair_trace(pl);
- for (e = first; e; e = e.chain)
- e.solid = SOLID_TRIGGER;
+ IL_EACH(g_ctrace_changed, it.ctrace_solidchanged,
+ {
+ it.solid = SOLID_TRIGGER;
+ it.ctrace_solidchanged = false;
+ });
+
+ IL_CLEAR(g_ctrace_changed);
}
void WarpZone_crosshair_trace(entity pl)
{
- WarpZone_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));
-}
-
-
-string admin_name()
-{
- if(autocvar_sv_adminnick != "")
- return autocvar_sv_adminnick;
- else
- return "SERVER ADMIN";
+ WarpZone_traceline_antilag(pl, CS(pl).cursor_trace_start, CS(pl).cursor_trace_start + normalize(CS(pl).cursor_trace_endpos - CS(pl).cursor_trace_start) * max_shot_distance, MOVE_NORMAL, pl, ANTILAG_LATENCY(pl));
}
}
if (autocvar_sv_eventlog_console)
{
- LOG_INFO(s, "\n");
+ dedicated_print(strcat(s, "\n"));
}
}
}
}
-entity findnearest(vector point, .string field, string value, vector axismod)
+entity findnearest(vector point, bool checkitems, vector axismod)
{
- entity localhead;
- float i;
- float j;
- float len;
vector dist;
+ int num_nearest = 0;
- float num_nearest;
- num_nearest = 0;
-
- localhead = find(world, field, value);
- while (localhead)
+ IL_EACH(((checkitems) ? g_items : g_locations), ((checkitems) ? (it.target == "###item###") : (it.classname == "target_location")),
{
- if ((localhead.items == IT_KEY1 || localhead.items == IT_KEY2) && localhead.target == "###item###")
- dist = localhead.oldorigin;
+ if ((it.items == IT_KEY1 || it.items == IT_KEY2) && it.target == "###item###")
+ dist = it.oldorigin;
else
- dist = localhead.origin;
+ dist = it.origin;
dist = dist - point;
dist = dist.x * axismod.x * '1 0 0' + dist.y * axismod.y * '0 1 0' + dist.z * axismod.z * '0 0 1';
- len = vlen(dist);
+ float len = vlen2(dist);
- for (i = 0; i < num_nearest; ++i)
+ int l;
+ for (l = 0; l < num_nearest; ++l)
{
- if (len < nearest_length[i])
+ if (len < nearest_length[l])
break;
}
// now i tells us where to insert at
// INSERTION SORT! YOU'VE SEEN IT! RUN!
- if (i < NUM_NEAREST_ENTITIES)
+ if (l < NUM_NEAREST_ENTITIES)
{
- for (j = NUM_NEAREST_ENTITIES - 1; j >= i; --j)
+ for (int j = NUM_NEAREST_ENTITIES - 1; j >= l; --j)
{
nearest_length[j + 1] = nearest_length[j];
nearest_entity[j + 1] = nearest_entity[j];
}
- nearest_length[i] = len;
- nearest_entity[i] = localhead;
+ nearest_length[l] = len;
+ nearest_entity[l] = it;
if (num_nearest < NUM_NEAREST_ENTITIES)
num_nearest = num_nearest + 1;
}
-
- localhead = find(localhead, field, value);
- }
+ });
// now use the first one from our list that we can see
- for (i = 0; i < num_nearest; ++i)
+ for (int j = 0; j < num_nearest; ++j)
{
- traceline(point, nearest_entity[i].origin, true, world);
+ traceline(point, nearest_entity[j].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");
- }
- return nearest_entity[i];
+ if (j != 0)
+ LOG_TRACEF("Nearest point (%s) is not visible, using a visible one.", nearest_entity[0].netname);
+ return nearest_entity[j];
}
}
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)
string NearestLocation(vector p)
{
- entity loc;
- string ret;
- ret = "somewhere";
- loc = findnearest(p, classname, "target_location", '1 1 1');
+ string ret = "somewhere";
+ entity loc = findnearest(p, false, '1 1 1');
if (loc)
- {
ret = loc.message;
- }
else
{
- loc = findnearest(p, target, "###item###", '1 1 4');
+ loc = findnearest(p, true, '1 1 4');
if (loc)
ret = loc.netname;
}
return ret;
}
+string AmmoNameFromWeaponentity(entity wpn)
+{
+ string ammoitems = "batteries";
+ switch((wpn.m_weapon).ammo_field)
+ {
+ case ammo_shells: ammoitems = ITEM_Shells.m_name; break;
+ case ammo_nails: ammoitems = ITEM_Bullets.m_name; break;
+ case ammo_rockets: ammoitems = ITEM_Rockets.m_name; break;
+ case ammo_cells: ammoitems = ITEM_Cells.m_name; break;
+ case ammo_plasma: ammoitems = ITEM_Plasma.m_name; break;
+ case ammo_fuel: ammoitems = ITEM_JetpackFuel.m_name; break;
+ }
+ return ammoitems;
+}
+
string formatmessage(entity this, string msg)
{
float p, p1, p2;
entity cursor_ent;
string escape;
string replacement;
- string ammoitems;
p = 0;
n = 7;
- ammoitems = "batteries";
- if(this.items & ITEM_Plasma.m_itemid) ammoitems = ITEM_Plasma.m_name;
- if(this.items & ITEM_Cells.m_itemid) ammoitems = ITEM_Cells.m_name;
- if(this.items & ITEM_Rockets.m_itemid) ammoitems = ITEM_Rockets.m_name;
- if(this.items & ITEM_Shells.m_itemid) ammoitems = ITEM_Shells.m_name;
-
WarpZone_crosshair_trace(this);
cursor = trace_endpos;
cursor_ent = trace_ent;
+ MUTATOR_CALLHOOK(PreFormatMessage, this, msg);
+ msg = M_ARGV(1, string);
+
while (1) {
if (n < 1)
break; // too many replacements
replacement = substring(msg, p, 2);
escape = substring(msg, p + 1, 1);
+ .entity weaponentity = weaponentities[0]; // TODO: unhardcode
+
switch(escape)
{
case "%": replacement = "%"; break;
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 = ammoitems; 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 = AmmoNameFromWeaponentity(this.(weaponentity)); 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;
case "S": replacement = ftos(vlen(this.velocity)); break;
0: sends the request
>0: receives a cvar from name=argv(f) value=argv(f+1)
*/
-void GetCvars_handleString(entity this, string thisname, float f, .string field, string name)
+void GetCvars_handleString(entity this, entity store, string thisname, float f, .string field, string name)
{
if (f < 0)
{
- if (this.(field))
- strunzone(this.(field));
- this.(field) = string_null;
+ if (store.(field))
+ strunzone(store.(field));
+ store.(field) = string_null;
}
else if (f > 0)
{
if (thisname == name)
{
- if (this.(field))
- strunzone(this.(field));
- this.(field) = strzone(argv(f + 1));
+ if (store.(field))
+ strunzone(store.(field));
+ store.(field) = strzone(argv(f + 1));
}
}
else
stuffcmd(this, strcat("cl_cmd sendcvar ", name, "\n"));
}
-void GetCvars_handleString_Fixup(entity this, string thisname, float f, .string field, string name, string(entity, string) func)
+void GetCvars_handleString_Fixup(entity this, entity store, string thisname, float f, .string field, string name, string(entity, string) func)
{
- GetCvars_handleString(this, thisname, f, field, name);
+ GetCvars_handleString(this, store, thisname, f, field, name);
if (f >= 0) // also initialize to the fitting value for "" when sending cvars out
if (thisname == name)
{
- string s = func(this, strcat1(this.(field)));
- if (s != this.(field))
+ string s = func(this, strcat1(store.(field)));
+ if (s != store.(field))
{
- strunzone(this.(field));
- this.(field) = strzone(s);
+ strunzone(store.(field));
+ store.(field) = strzone(s);
}
}
}
-void GetCvars_handleFloat(entity this, string thisname, float f, .float field, string name)
+void GetCvars_handleFloat(entity this, entity store, string thisname, float f, .float field, string name)
{
if (f < 0)
{
else if (f > 0)
{
if (thisname == name)
- this.(field) = stof(argv(f + 1));
+ store.(field) = stof(argv(f + 1));
}
else
stuffcmd(this, strcat("cl_cmd sendcvar ", name, "\n"));
}
-void GetCvars_handleFloatOnce(entity this, string thisname, float f, .float field, string name)
+void GetCvars_handleFloatOnce(entity this, entity store, string thisname, float f, .float field, string name)
{
if (f < 0)
{
{
if (thisname == name)
{
- if (!this.(field))
+ if (!store.(field))
{
- this.(field) = stof(argv(f + 1));
- if (!this.(field))
- this.(field) = -1;
+ store.(field) = stof(argv(f + 1));
+ if (!store.(field))
+ store.(field) = -1;
}
}
}
else
{
- if (!this.(field))
+ if (!store.(field))
stuffcmd(this, strcat("cl_cmd sendcvar ", name, "\n"));
}
}
/**
* @param f -1: cleanup, 0: request, 1: receive
*/
-void GetCvars(entity this, int f)
+void GetCvars(entity this, entity store, int f)
{
string s = string_null;
Notification_GetCvars(this);
- ReplicateVars(this, s, f);
+ ReplicateVars(this, store, s, f);
- 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_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriority, "cl_weaponpriority", W_FixWeaponOrder_ForceComplete_AndBuildImpulseList);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[0], "cl_weaponpriority0", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[1], "cl_weaponpriority1", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[2], "cl_weaponpriority2", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[3], "cl_weaponpriority3", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[4], "cl_weaponpriority4", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[5], "cl_weaponpriority5", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[6], "cl_weaponpriority6", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[7], "cl_weaponpriority7", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[8], "cl_weaponpriority8", W_FixWeaponOrder_AllowIncomplete);
+ GetCvars_handleString_Fixup(this, store, s, f, cvar_cl_weaponpriorities[9], "cl_weaponpriority9", W_FixWeaponOrder_AllowIncomplete);
- GetCvars_handleFloat(this, s, f, cvar_cl_allow_uidtracking, "cl_allow_uidtracking");
+ GetCvars_handleFloat(this, store, 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);
}
}
// decolorizes and team colors the player name when needed
-string playername(entity p)
+string playername(entity p, bool team_colorize)
{
string t;
- if (teamplay && !intermission_running && IS_PLAYER(p))
+ if (team_colorize && teamplay && !intermission_running && IS_PLAYER(p))
{
t = Team_ColorCode(p.team);
return strcat(t, strdecolorize(p.netname));
{
g_weaponarena = 1;
g_weaponarena_list = "All Weapons";
- FOREACH(Weapons, it != WEP_Null, LAMBDA(
+ FOREACH(Weapons, it != WEP_Null, {
if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
g_weaponarena_weapons |= (it.m_wepset);
- ));
+ });
+ }
+ else if (s == "devall")
+ {
+ g_weaponarena = 1;
+ g_weaponarena_list = "All Weapons"; // TODO: report as more than just all weapons?
+ FOREACH(Weapons, it != WEP_Null,
+ {
+ g_weaponarena_weapons |= (it.m_wepset);
+ });
}
else if (s == "most")
{
g_weaponarena = 1;
g_weaponarena_list = "Most Weapons";
- FOREACH(Weapons, it != WEP_Null, LAMBDA(
+ FOREACH(Weapons, it != WEP_Null, {
if(!(it.spawnflags & WEP_FLAG_MUTATORBLOCKED))
if(it.spawnflags & WEP_FLAG_NORMAL)
g_weaponarena_weapons |= (it.m_wepset);
- ));
+ });
}
else if (s == "none")
{
for (i = 0; i < t; ++i)
{
s = argv(i);
- FOREACH(Weapons, it != WEP_Null, LAMBDA(
+ FOREACH(Weapons, it != WEP_Null, {
if(it.netname == s)
{
g_weaponarena_weapons |= (it.m_wepset);
g_weaponarena_list = strcat(g_weaponarena_list, it.m_name, " & ");
break;
}
- ));
+ });
}
g_weaponarena_list = strzone(substring(g_weaponarena_list, 0, strlen(g_weaponarena_list) - 3));
}
}
else
{
- FOREACH(Weapons, it != WEP_Null, LAMBDA(
+ FOREACH(Weapons, it != WEP_Null, {
int w = want_weapon(it, false);
WepSet s = it.m_wepset;
if(w & 1)
start_weapons_default |= s;
if(w & 4)
start_weapons_defaultmask |= s;
- ));
+ });
}
if(!cvar("g_use_ammunition"))
start_ammo_cells = cvar("g_start_ammo_cells");
start_ammo_plasma = cvar("g_start_ammo_plasma");
start_ammo_fuel = cvar("g_start_ammo_fuel");
+ random_start_weapons_count = cvar("g_random_start_weapons_count");
+ random_start_shells = cvar("g_random_start_shells");
+ random_start_bullets = cvar("g_random_start_bullets");
+ random_start_rockets = cvar("g_random_start_rockets");
+ random_start_cells = cvar("g_random_start_cells");
+ random_start_plasma = cvar("g_random_start_plasma");
}
if (warmup_stage)
warmup_start_weapons = '0 0 0';
warmup_start_weapons_default = '0 0 0';
warmup_start_weapons_defaultmask = '0 0 0';
- FOREACH(Weapons, it != WEP_Null, LAMBDA(
+ FOREACH(Weapons, it != WEP_Null, {
int w = want_weapon(it, g_warmup_allguns);
WepSet s = (it.m_wepset);
if(w & 1)
warmup_start_weapons_default |= s;
if(w & 4)
warmup_start_weapons_defaultmask |= s;
- ));
+ });
}
}
WepSet precache_weapons = start_weapons;
if (g_warmup_allguns != 1)
precache_weapons |= warmup_start_weapons;
- FOREACH(Weapons, it != WEP_Null, LAMBDA(
+ FOREACH(Weapons, it != WEP_Null, {
if(precache_weapons & (it.m_wepset))
it.wr_init(it);
- ));
+ });
start_ammo_shells = max(0, start_ammo_shells);
start_ammo_nails = max(0, start_ammo_nails);
start_ammo_cells = max(0, start_ammo_cells);
start_ammo_plasma = max(0, start_ammo_plasma);
start_ammo_fuel = max(0, start_ammo_fuel);
+ random_start_shells = max(0, random_start_shells);
+ random_start_bullets = max(0, random_start_bullets);
+ random_start_rockets = max(0, random_start_rockets);
+ random_start_cells = max(0, random_start_cells);
+ random_start_plasma = max(0, random_start_plasma);
warmup_start_ammo_shells = max(0, warmup_start_ammo_shells);
warmup_start_ammo_nails = max(0, warmup_start_ammo_nails);
void precache_playermodels(string s)
{
- FOREACH_WORD(s, true, LAMBDA(precache_playermodel(it)));
+ FOREACH_WORD(s, true, { precache_playermodel(it); });
}
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
}
{
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)))
}
}
-void objerror(string s)
-{SELFPARAM(); // needed for engine functions
- make_safe_for_remove(self);
- builtin_objerror(s);
-}
-
.float remove_except_protected_forbidden;
void remove_except_protected(entity e)
{
e.initialize_entity_order = order;
cur = initialize_entity_first;
- prev = world;
+ prev = NULL;
for (;;)
{
if (!cur || cur.initialize_entity_order > order)
{
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;
//dprint("Delayed initialization: ", e.classname, "\n");
if (func)
{
- WITHSELF(e, func(e));
+ func(e);
}
else
{
}
e = next;
}
- remove = remove_unsafely;
+ delete_fn = remove_unsafely;
}
.float(entity) isEliminated;
{
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
// 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;
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;
}
}
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)
}
else
{
- LOG_INFO("Received HTTP request data for an invalid id ", ftos(id), ".\n");
+ LOG_INFO("Received HTTP request data for an invalid id ", ftos(id), ".");
}
}
{
float m, i;
vector start, org, delta, end, enddown, mstart;
- entity sp;
m = e.dphitcontentsmask;
e.dphitcontentsmask = goodcontents | badcontents;
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;
}
{
setorigin(e, start);
e.angles = vectoangles(end - start);
- LOG_TRACE("Needed ", ftos(i + 1), " attempts\n");
+ LOG_DEBUG("Needed ", ftos(i + 1), " attempts");
return true;
}
else
float tagscale;
org = e.origin - gettaginfo(to, gettagindex(to, tag));
- tagscale = pow(vlen(v_forward), -2); // undo a scale on the tag
+ tagscale = (vlen(v_forward) ** -2); // undo a scale on the tag
t_forward = v_forward * tagscale;
t_left = v_right * -tagscale;
t_up = v_up * tagscale;
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
void unfollow_sameorigin(entity e)
{
- e.movetype = MOVETYPE_NONE;
+ set_movetype(e, MOVETYPE_NONE);
}
entity gettaginfo_relative_ent;
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
}
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("???");
*/