// random functions
void assault_objective_use()
-{
+{SELFPARAM();
// activate objective
self.health = 100;
//print("^2Activated objective ", self.targetname, "=", etos(self), "\n");
//print("Activator is ", activator.classname, "\n");
- entity oldself;
- oldself = self;
-
- for(self = world; (self = find(self, target, oldself.targetname)); )
+ for (entity e = world; (e = find(e, target, this.targetname)); )
{
- if(self.classname == "target_objective_decrease")
- target_objective_decrease_activate();
+ if (e.classname == "target_objective_decrease")
+ {
+ WITH(entity, self, e, target_objective_decrease_activate());
+ }
}
- self = oldself;
+ setself(this);
}
vector target_objective_spawn_evalfunc(entity player, entity spot, vector current)
-{
+{SELFPARAM();
if(self.health < 0 || self.health >= ASSAULT_VALUE_INACTIVE)
return '-1 0 0';
return current;
// reset this objective. Used when spawning an objective
// and when a new round starts
void assault_objective_reset()
-{
+{SELFPARAM();
self.health = ASSAULT_VALUE_INACTIVE;
}
// decrease the health of targeted objectives
void assault_objective_decrease_use()
-{
+{SELFPARAM();
if(activator.team != assault_attacker_team)
{
// wrong team triggered decrease
PlayerTeamScore_Add(activator, SP_ASSAULT_OBJECTIVES, ST_ASSAULT_OBJECTIVES, 1);
self.enemy.health = -1;
- entity oldself, oldactivator, head;
+ entity oldactivator, head;
- oldself = self;
- self = oldself.enemy;
+ setself(this.enemy);
if(self.message)
FOR_EACH_PLAYER(head)
centerprint(head, self.message);
oldactivator = activator;
- activator = oldself;
+ activator = this;
SUB_UseTargets();
activator = oldactivator;
- self = oldself;
+ setself(this);
}
}
}
void assault_setenemytoobjective()
-{
+{SELFPARAM();
entity objective;
for(objective = world; (objective = find(objective, targetname, self.target)); )
{
}
float assault_decreaser_sprite_visible(entity e)
-{
+{SELFPARAM();
entity decreaser;
decreaser = self.assault_decreaser;
}
void target_objective_decrease_activate()
-{
+{SELFPARAM();
entity ent, spr;
self.owner = world;
for(ent = world; (ent = find(ent, target, self.targetname)); )
}
void target_assault_roundend_reset()
-{
+{SELFPARAM();
//print("round end reset\n");
self.cnt = self.cnt + 1; // up round counter
self.winning = 0; // up round
}
void target_assault_roundend_use()
-{
+{SELFPARAM();
self.winning = 1; // round has been won by attackers
}
void assault_roundstart_use()
-{
+{SELFPARAM();
activator = self;
SUB_UseTargets();
- entity ent, oldself;
-
//(Re)spawn all turrets
- oldself = self;
- ent = find(world, classname, "turret_main");
- while(ent) {
+ for(entity ent = NULL; (ent = find(ent, classname, "turret_main")); ) {
// Swap turret teams
if(ent.team == NUM_TEAM_1)
ent.team = NUM_TEAM_2;
else
ent.team = NUM_TEAM_1;
- self = ent;
-
// Dubbles as teamchange
- turret_respawn();
-
- ent = find(ent, classname, "turret_main");
+ WITH(entity, self, ent, turret_respawn());
}
- self = oldself;
}
void assault_wall_think()
-{
+{SELFPARAM();
if(self.enemy.health < 0)
{
self.model = "";
void vehicles_clearreturn(entity veh);
void vehicles_spawn();
void assault_new_round()
-{
- entity oldself;
+{SELFPARAM();
//bprint("ASSAULT: new round\n");
- oldself = self;
// Eject players from vehicles
- FOR_EACH_PLAYER(self)
+ entity e;
+ FOR_EACH_PLAYER(e)
{
- if(self.vehicle)
- vehicles_exit(VHEF_RELEASE);
+ if(e.vehicle)
+ {
+ WITH(entity, self, e, vehicles_exit(VHEF_RELEASE));
+ }
}
- self = findchainflags(vehicle_flags, VHF_ISVEHICLE);
- while(self)
+ for (entity e_ = findchainflags(vehicle_flags, VHF_ISVEHICLE); e_; e_ = e_.chain)
{
+ setself(e_);
vehicles_clearreturn(self);
vehicles_spawn();
- self = self.chain;
}
- self = oldself;
+ setself(this);
// up round counter
self.winning = self.winning + 1;
}
// spawnfuncs
-void spawnfunc_info_player_attacker()
+spawnfunc(info_player_attacker)
{
if (!g_assault) { remove(self); return; }
self.team = NUM_TEAM_1; // red, gets swapped every round
- spawnfunc_info_player_deathmatch();
+ spawnfunc_info_player_deathmatch(this);
}
-void spawnfunc_info_player_defender()
+spawnfunc(info_player_defender)
{
if (!g_assault) { remove(self); return; }
self.team = NUM_TEAM_2; // blue, gets swapped every round
- spawnfunc_info_player_deathmatch();
+ spawnfunc_info_player_deathmatch(this);
}
-void spawnfunc_target_objective()
+spawnfunc(target_objective)
{
if (!g_assault) { remove(self); return; }
self.spawn_evalfunc = target_objective_spawn_evalfunc;
}
-void spawnfunc_target_objective_decrease()
+spawnfunc(target_objective_decrease)
{
if (!g_assault) { remove(self); return; }
}
// destructible walls that can be used to trigger target_objective_decrease
-void spawnfunc_func_assault_destructible()
+spawnfunc(func_assault_destructible)
{
if (!g_assault) { remove(self); return; }
else
self.team = NUM_TEAM_1;
- spawnfunc_func_breakable();
+ spawnfunc_func_breakable(this);
}
-void spawnfunc_func_assault_wall()
+spawnfunc(func_assault_wall)
{
if (!g_assault) { remove(self); return; }
self.classname = "func_assault_wall";
self.mdl = self.model;
- setmodel(self, self.mdl);
+ _setmodel(self, self.mdl);
self.solid = SOLID_BSP;
self.think = assault_wall_think;
self.nextthink = time;
InitializeEntity(self, assault_setenemytoobjective, INITPRIO_FINDTARGET);
}
-void spawnfunc_target_assault_roundend()
+spawnfunc(target_assault_roundend)
{
if (!g_assault) { remove(self); return; }
self.reset = target_assault_roundend_reset;
}
-void spawnfunc_target_assault_roundstart()
+spawnfunc(target_assault_roundstart)
{
if (!g_assault) { remove(self); return; }
// legacy bot code
void havocbot_goalrating_ast_targets(float ratingscale)
-{
+{SELFPARAM();
entity ad, best, wp, tod;
float radius, found, bestvalue;
vector p;
}
void havocbot_role_ast_offense()
-{
+{SELFPARAM();
if(self.deadflag != DEAD_NO)
{
self.havocbot_attack_time = 0;
}
void havocbot_role_ast_defense()
-{
+{SELFPARAM();
if(self.deadflag != DEAD_NO)
{
self.havocbot_attack_time = 0;
}
void havocbot_ast_reset_role(entity bot)
-{
+{SELFPARAM();
if(self.deadflag != DEAD_NO)
return;
// mutator hooks
MUTATOR_HOOKFUNCTION(assault_PlayerSpawn)
-{
+{SELFPARAM();
if(self.team == assault_attacker_team)
Send_Notification(NOTIF_ONE, self, MSG_CENTER, CENTER_ASSAULT_ATTACKING);
else
}
MUTATOR_HOOKFUNCTION(assault_TurretSpawn)
-{
+{SELFPARAM();
if(!self.team || self.team == MAX_SHOT_DISTANCE)
self.team = 5; // this gets reversed when match starts?
}
MUTATOR_HOOKFUNCTION(assault_VehicleSpawn)
-{
+{SELFPARAM();
self.nextthink = time + 0.5;
return false;
}
MUTATOR_HOOKFUNCTION(assault_BotRoles)
-{
+{SELFPARAM();
havocbot_ast_reset_role(self);
return true;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff