// score rule declarations
const int ST_ONS_CAPS = 1;
-const int SP_ONS_CAPS = 4;
-const int SP_ONS_TAKES = 6;
#endif
#endif
{
entity e = WaypointSprite_getviewentity(other);
- if(!self.enemy.isshielded && (ons_ControlPoint_Attackable(self.enemy, e.team) > 0 || self.enemy.classname != "onslaught_controlpoint")) { return false; }
- if(SAME_TEAM(self, e)) { return false; }
+ if(!this.enemy.isshielded && (ons_ControlPoint_Attackable(this.enemy, e.team) > 0 || this.enemy.classname != "onslaught_controlpoint")) { return false; }
+ if(SAME_TEAM(this, e)) { return false; }
return true;
}
void ons_CaptureShield_Touch(entity this)
{
- if(!self.enemy.isshielded && (ons_ControlPoint_Attackable(self.enemy, other.team) > 0 || self.enemy.classname != "onslaught_controlpoint")) { return; }
+ if(!this.enemy.isshielded && (ons_ControlPoint_Attackable(this.enemy, other.team) > 0 || this.enemy.classname != "onslaught_controlpoint")) { return; }
if(!IS_PLAYER(other)) { return; }
- if(SAME_TEAM(other, self)) { return; }
+ if(SAME_TEAM(other, this)) { return; }
- vector mymid = (self.absmin + self.absmax) * 0.5;
+ vector mymid = (this.absmin + this.absmax) * 0.5;
vector othermid = (other.absmin + other.absmax) * 0.5;
- Damage(other, self, self, 0, DEATH_HURTTRIGGER.m_id, mymid, normalize(othermid - mymid) * ons_captureshield_force);
+ Damage(other, this, this, 0, DEATH_HURTTRIGGER.m_id, mymid, normalize(othermid - mymid) * ons_captureshield_force);
if(IS_REAL_CLIENT(other))
{
play2(other, SND(ONS_DAMAGEBLOCKEDBYSHIELD));
- if(self.enemy.classname == "onslaught_generator")
+ if(this.enemy.classname == "onslaught_generator")
Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_ONS_GENERATOR_SHIELDED);
else
Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_ONS_CONTROLPOINT_SHIELDED);
WriteByte(MSG_ENTITY, sendflags);
if(sendflags & 1)
{
- WriteCoord(MSG_ENTITY, self.goalentity.origin_x);
- WriteCoord(MSG_ENTITY, self.goalentity.origin_y);
- WriteCoord(MSG_ENTITY, self.goalentity.origin_z);
+ WriteCoord(MSG_ENTITY, this.goalentity.origin_x);
+ WriteCoord(MSG_ENTITY, this.goalentity.origin_y);
+ WriteCoord(MSG_ENTITY, this.goalentity.origin_z);
}
if(sendflags & 2)
{
- WriteCoord(MSG_ENTITY, self.enemy.origin_x);
- WriteCoord(MSG_ENTITY, self.enemy.origin_y);
- WriteCoord(MSG_ENTITY, self.enemy.origin_z);
+ WriteCoord(MSG_ENTITY, this.enemy.origin_x);
+ WriteCoord(MSG_ENTITY, this.enemy.origin_y);
+ WriteCoord(MSG_ENTITY, this.enemy.origin_z);
}
if(sendflags & 4)
{
- WriteByte(MSG_ENTITY, self.clientcolors); // which is goalentity's color + enemy's color * 16
+ WriteByte(MSG_ENTITY, this.clientcolors); // which is goalentity's color + enemy's color * 16
}
return true;
}
void ons_DelayedLinkSetup(entity this)
{
- this.goalentity = find(world, targetname, this.target);
- this.enemy = find(world, targetname, this.target2);
- if(!this.goalentity) { objerror("can not find target\n"); }
- if(!this.enemy) { objerror("can not find target2\n"); }
+ this.goalentity = find(NULL, targetname, this.target);
+ this.enemy = find(NULL, targetname, this.target2);
+ if(!this.goalentity) { objerror(this, "can not find target\n"); }
+ if(!this.enemy) { objerror(this, "can not find target2\n"); }
LOG_DEBUG(strcat(etos(this.goalentity), " linked with ", etos(this.enemy), "\n"));
this.SendFlags |= 3;
{
sound(this, CH_TRIGGER, SND_GRENADE_IMPACT, VOL_BASE, ATTEN_NORM);
pointparticles(EFFECT_ROCKET_EXPLODE, this.origin, '0 0 0', 1);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_CPDESTROYED), this.owner.message, attacker.netname);
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_CPDESTROYED), this.owner.message, attacker.netname);
PlayerScore_Add(attacker, SP_ONS_TAKES, 1);
PlayerScore_Add(attacker, SP_SCORE, 10);
- this.owner.goalentity = world;
+ this.owner.goalentity = NULL;
this.owner.islinked = false;
this.owner.iscaptured = false;
this.owner.team = 0;
if(IS_PLAYER(this.owner.ons_toucher))
{
- Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ONSLAUGHT_CAPTURE, this.owner.ons_toucher.netname, this.owner.message);
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ONSLAUGHT_CAPTURE, this.owner.ons_toucher.netname, this.owner.message);
Send_Notification(NOTIF_ALL_EXCEPT, this.owner.ons_toucher, MSG_CENTER, APP_TEAM_NUM(this.owner.ons_toucher.team, CENTER_ONS_CAPTURE), this.owner.message);
Send_Notification(NOTIF_ONE, this.owner.ons_toucher, MSG_CENTER, CENTER_ONS_CAPTURE, this.owner.message);
PlayerScore_Add(this.owner.ons_toucher, SP_ONS_CAPS, 1);
PlayerTeamScore_AddScore(this.owner.ons_toucher, 10);
}
- this.owner.ons_toucher = world;
+ this.owner.ons_toucher = NULL;
onslaught_updatelinks();
if(STAT(FROZEN, toucher)) { return; }
if(IS_DEAD(toucher)) { return; }
- if ( SAME_TEAM(self,toucher) )
- if ( self.iscaptured )
+ if ( SAME_TEAM(this,toucher) )
+ if ( this.iscaptured )
{
if(time <= toucher.teleport_antispam)
Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_ONS_TELEPORT_ANTISPAM, rint(toucher.teleport_antispam - time));
Send_Notification(NOTIF_ONE, toucher, MSG_CENTER, CENTER_ONS_TELEPORT);
}
- attackable = ons_ControlPoint_Attackable(self, toucher.team);
+ attackable = ons_ControlPoint_Attackable(this, toucher.team);
if(attackable != 2 && attackable != 4)
return;
// we've verified that this player has a legitimate claim to this point,
// so start building the captured point icon (which only captures this
// point if it successfully builds without being destroyed first)
- ons_ControlPoint_Icon_Spawn(self, toucher);
+ ons_ControlPoint_Icon_Spawn(this, toucher);
- self.ons_toucher = toucher;
+ this.ons_toucher = toucher;
onslaught_updatelinks();
}
void ons_ControlPoint_Think(entity this)
{
- self.nextthink = time + ONS_CP_THINKRATE;
- CSQCMODEL_AUTOUPDATE(self);
+ this.nextthink = time + ONS_CP_THINKRATE;
+ CSQCMODEL_AUTOUPDATE(this);
}
void ons_ControlPoint_Reset(entity this)
if(this.goalentity)
remove(this.goalentity);
- this.goalentity = world;
+ this.goalentity = NULL;
this.team = 0;
this.colormap = 1024;
this.iscaptured = false;
this.islinked = false;
this.isshielded = true;
setthink(this, ons_ControlPoint_Think);
- this.ons_toucher = world;
+ this.ons_toucher = NULL;
this.nextthink = time + ONS_CP_THINKRATE;
setmodel_fixsize(this, MDL_ONS_CP_PAD1);
else
{
if (attacker == this)
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_GENDESTROYED_OVERTIME));
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_GENDESTROYED_OVERTIME));
else
{
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_GENDESTROYED));
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(this.team, INFO_ONSLAUGHT_GENDESTROYED));
PlayerScore_Add(attacker, SP_SCORE, 100);
}
this.iscaptured = false;
void ons_DelayedGeneratorSetup(entity this)
{
// bot waypoints
- waypoint_spawnforitem_force(self, self.origin);
- self.nearestwaypointtimeout = 0; // activate waypointing again
- self.bot_basewaypoint = self.nearestwaypoint;
+ waypoint_spawnforitem_force(this, this.origin);
+ this.nearestwaypointtimeout = 0; // activate waypointing again
+ this.bot_basewaypoint = this.nearestwaypoint;
// captureshield setup
- ons_CaptureShield_Spawn(self, true);
+ ons_CaptureShield_Spawn(this, true);
onslaught_updatelinks();
- Net_LinkEntity(self, false, 0, generator_send);
+ Net_LinkEntity(this, false, 0, generator_send);
}
void onslaught_generator_touch(entity this)
{
if ( IS_PLAYER(other) )
- if ( SAME_TEAM(self,other) )
- if ( self.iscaptured )
+ if ( SAME_TEAM(this,other) )
+ if ( this.iscaptured )
{
Send_Notification(NOTIF_ONE, other, MSG_CENTER, CENTER_ONS_TELEPORT);
}
if (!wpforenemy_announced)
{
- Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_OVERTIME_CONTROLPOINT);
- sound(world, CH_INFO, SND_ONS_GENERATOR_DECAY, VOL_BASE, ATTEN_NONE);
+ Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_OVERTIME_CONTROLPOINT);
+ sound(NULL, CH_INFO, SND_ONS_GENERATOR_DECAY, VOL_BASE, ATTEN_NONE);
wpforenemy_announced = true;
}
if(winner_team > 0)
{
- Send_Notification(NOTIF_ALL, world, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
- Send_Notification(NOTIF_ALL, world, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
+ Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, APP_TEAM_NUM(winner_team, CENTER_ROUND_TEAM_WIN));
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, APP_TEAM_NUM(winner_team, INFO_ROUND_TEAM_WIN));
TeamScore_AddToTeam(winner_team, ST_ONS_CAPS, +1);
}
else if(winner_team == -1)
{
- Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ROUND_TIED);
- Send_Notification(NOTIF_ALL, world, MSG_INFO, INFO_ROUND_TIED);
+ Send_Notification(NOTIF_ALL, NULL, MSG_CENTER, CENTER_ROUND_TIED);
+ Send_Notification(NOTIF_ALL, NULL, MSG_INFO, INFO_ROUND_TIED);
}
ons_stalemate = false;
// gather health and armor only
if (head.solid)
if ( ((head.health || head.armorvalue) && needarmor) || (head.weapons && needweapons ) )
- if (vlen(head.origin - org) < sradius)
+ if (vdist(head.origin - org, <, sradius))
{
t = head.bot_pickupevalfunc(this, head);
if (t > 0)
// We'll consider only the best case
bestvalue = 99999999999;
- cp = world;
+ cp = NULL;
for(cp1 = ons_worldcplist; cp1; cp1 = cp1.ons_worldcpnext)
{
if (!cp1.wpconsidered)
// Should be attacked
// Rate waypoints near it
found = false;
- best = world;
+ best = NULL;
bestvalue = 99999999999;
for(radius=0; radius<1000 && !found; radius+=500)
{
// Should be attacked
// Rate waypoints near it
found = false;
- bestwp = world;
+ bestwp = NULL;
best = 99999999999;
for(wp=findradius(g.origin,400); wp; wp=wp.chain)
if(IS_DEAD(this))
return;
- this.havocbot_ons_target = world;
+ this.havocbot_ons_target = NULL;
// TODO: Defend control points or generator if necessary
*/
entity ons_Nearest_ControlPoint(entity this, vector pos, float max_dist)
{
- entity tmp_entity, closest_target = world;
+ entity tmp_entity, closest_target = NULL;
tmp_entity = findchain(classname, "onslaught_controlpoint");
while(tmp_entity)
{
if(SAME_TEAM(tmp_entity, this))
if(tmp_entity.iscaptured)
if(max_dist <= 0 || vdist(tmp_entity.origin - pos, <=, max_dist))
- if(vlen2(tmp_entity.origin - pos) <= vlen2(closest_target.origin - pos) || closest_target == world)
+ if(vlen2(tmp_entity.origin - pos) <= vlen2(closest_target.origin - pos) || closest_target == NULL)
closest_target = tmp_entity;
tmp_entity = tmp_entity.chain;
}
{
if(SAME_TEAM(tmp_entity, this))
if(max_dist <= 0 || vdist(tmp_entity.origin - pos, <, max_dist))
- if(vlen2(tmp_entity.origin - pos) <= vlen2(closest_target.origin - pos) || closest_target == world)
+ if(vlen2(tmp_entity.origin - pos) <= vlen2(closest_target.origin - pos) || closest_target == NULL)
closest_target = tmp_entity;
tmp_entity = tmp_entity.chain;
}
*/
entity ons_Nearest_ControlPoint_2D(entity this, vector pos, float max_dist)
{
- entity tmp_entity, closest_target = world;
+ entity tmp_entity, closest_target = NULL;
vector delta;
float smallest_distance = 0, distance;
if(SAME_TEAM(tmp_entity, this))
if(tmp_entity.iscaptured)
if(max_dist <= 0 || distance <= max_dist)
- if(closest_target == world || distance <= smallest_distance )
+ if(closest_target == NULL || distance <= smallest_distance )
{
closest_target = tmp_entity;
smallest_distance = distance;
if(SAME_TEAM(tmp_entity, this))
if(max_dist <= 0 || distance <= max_dist)
- if(closest_target == world || distance <= smallest_distance )
+ if(closest_target == NULL || distance <= smallest_distance )
{
closest_target = tmp_entity;
smallest_distance = distance;
tracebox(loc, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), loc, MOVE_NORMAL, player);
if(trace_fraction == 1.0 && !trace_startsolid)
{
- traceline(tele_target.origin, loc, MOVE_NOMONSTERS, tele_target); // double check to make sure we're not spawning outside the world
+ traceline(tele_target.origin, loc, MOVE_NOMONSTERS, tele_target); // double check to make sure we're not spawning outside the NULL
if(trace_fraction == 1.0 && !trace_startsolid)
{
if ( tele_effects )
if ( player.ons_spawn_by )
if ( ons_Teleport(player,player.ons_spawn_by,autocvar_g_onslaught_teleport_radius,false) )
{
- player.ons_spawn_by = world;
+ player.ons_spawn_by = NULL;
return false;
}
if(random() <= autocvar_g_onslaught_spawn_at_controlpoints_chance)
{
float random_target = autocvar_g_onslaught_spawn_at_controlpoints_random;
- entity tmp_entity, closest_target = world;
+ entity tmp_entity, closest_target = NULL;
vector spawn_loc = player.ons_deathloc;
// new joining player or round reset, don't bother checking
if(SAME_TEAM(tmp_entity, player))
if(random_target)
RandomSelection_Add(tmp_entity, 0, string_null, 1, 1);
- else if(vlen(tmp_entity.origin - spawn_loc) <= vlen(closest_target.origin - spawn_loc) || closest_target == world)
+ else if(vlen2(tmp_entity.origin - spawn_loc) <= vlen2(closest_target.origin - spawn_loc) || closest_target == NULL)
closest_target = tmp_entity;
}
tracebox(loc, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), loc, MOVE_NORMAL, player);
if(trace_fraction == 1.0 && !trace_startsolid)
{
- traceline(closest_target.origin, loc, MOVE_NOMONSTERS, closest_target); // double check to make sure we're not spawning outside the world
+ traceline(closest_target.origin, loc, MOVE_NOMONSTERS, closest_target); // double check to make sure we're not spawning outside the NULL
if(trace_fraction == 1.0 && !trace_startsolid)
{
setorigin(player, loc);
if(random() <= autocvar_g_onslaught_spawn_at_generator_chance)
{
float random_target = autocvar_g_onslaught_spawn_at_generator_random;
- entity tmp_entity, closest_target = world;
+ entity tmp_entity, closest_target = NULL;
vector spawn_loc = player.ons_deathloc;
// new joining player or round reset, don't bother checking
else
{
if(SAME_TEAM(tmp_entity, player))
- if(vlen(tmp_entity.origin - spawn_loc) <= vlen(closest_target.origin - spawn_loc) || closest_target == world)
+ if(vlen2(tmp_entity.origin - spawn_loc) <= vlen2(closest_target.origin - spawn_loc) || closest_target == NULL)
closest_target = tmp_entity;
}
}
tracebox(loc, STAT(PL_MIN, NULL), STAT(PL_MAX, NULL), loc, MOVE_NORMAL, player);
if(trace_fraction == 1.0 && !trace_startsolid)
{
- traceline(closest_target.origin, loc, MOVE_NOMONSTERS, closest_target); // double check to make sure we're not spawning outside the world
+ traceline(closest_target.origin, loc, MOVE_NOMONSTERS, closest_target); // double check to make sure we're not spawning outside the NULL
if(trace_fraction == 1.0 && !trace_startsolid)
{
setorigin(player, loc);
{
entity mon = M_ARGV(0, entity);
- entity e = find(world, targetname, mon.target);
- if (e != world)
+ entity e = find(NULL, targetname, mon.target);
+ if (e != NULL)
mon.team = e.team;
}
if(own.targetname)
{
- entity e = find(world, target, own.targetname);
- if(e != world)
+ entity e = find(NULL, target, own.targetname);
+ if(e != NULL)
{
own.team = e.team;
if(own.targetname)
{
- entity e = find(world, target, own.targetname);
- if(e != world)
+ entity e = find(NULL, target, own.targetname);
+ if(e != NULL)
{
own.team = e.team;
own.active = ACTIVE_NOT;
entity closest_target = ons_Nearest_ControlPoint_2D(player, pos, autocvar_g_onslaught_click_radius);
- if ( closest_target == world )
+ if ( closest_target == NULL )
{
sprint(player, "\nNo control point found\n");
return true;
// ONS uses somewhat backwards linking.
if(turret.target)
{
- entity e = find(world, targetname, turret.target);
- if (e != world)
+ entity e = find(NULL, targetname, turret.target);
+ if (e != NULL)
turret.team = e.team;
}
if(!g_onslaught) { remove(this); return; }
if (this.target == "" || this.target2 == "")
- objerror("target and target2 must be set\n");
+ objerror(this, "target and target2 must be set\n");
this.ons_worldlinknext = ons_worldlinklist; // link into ons_worldlinklist
ons_worldlinklist = this;
spawnfunc(onslaught_generator)
{
if(!g_onslaught) { remove(this); return; }
- if(!this.team) { objerror("team must be set"); }
+ if(!this.team) { objerror(this, "team must be set"); }
ons_GeneratorSetup(this);
}
// scoreboard setup
void ons_ScoreRules()
{
- CheckAllowedTeams(world);
+ CheckAllowedTeams(NULL);
ScoreRules_basics(((c4>=0) ? 4 : (c3>=0) ? 3 : 2), SFL_SORT_PRIO_PRIMARY, 0, true);
ScoreInfo_SetLabel_TeamScore (ST_ONS_CAPS, "destroyed", SFL_SORT_PRIO_PRIMARY);
- ScoreInfo_SetLabel_PlayerScore(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY);
+ ScoreInfo_SetLabel_PlayerScore(SP_ONS_CAPS, "caps", SFL_SORT_PRIO_SECONDARY);
ScoreInfo_SetLabel_PlayerScore(SP_ONS_TAKES, "takes", 0);
ScoreRules_basics_end();
}
g_onslaught = true;
ons_captureshield_force = autocvar_g_onslaught_shield_force;
- InitializeEntity(world, ons_DelayedInit, INITPRIO_GAMETYPE);
+ InitializeEntity(NULL, ons_DelayedInit, INITPRIO_GAMETYPE);
}
#endif
projects / xonotic / xonotic-data.pk3dir.git / blobdiff