+#include "t_quake3.qh"
-#include "../common/weapons/all.qh"
+#include <common/weapons/_all.qh>
spawnfunc(weapon_crylink);
spawnfunc(weapon_electro);
spawnfunc(item_jetpack);
spawnfunc(item_armor_big);
-spawnfunc(item_armor_large);
+spawnfunc(item_armor_mega);
spawnfunc(item_armor_small);
spawnfunc(item_health_medium);
spawnfunc(ammo_rockets) { spawnfunc_item_rockets(this); }
// Armor
-spawnfunc(item_armor_body) { spawnfunc_item_armor_large(this); }
+spawnfunc(item_armor_body) { spawnfunc_item_armor_mega(this); }
spawnfunc(item_armor_combat) { spawnfunc_item_armor_big(this); }
spawnfunc(item_armor_shard) { spawnfunc_item_armor_small(this); }
spawnfunc(item_enviro) { spawnfunc_item_invincible(this); }
.float delay;
// weapon remove ent from df
-void target_init_verify()
+void target_init_verify(entity this)
{
entity trigger, targ;
- for(trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); )
- for(targ = world; (targ = find(targ, targetname, trigger.target)); )
+ for(trigger = NULL; (trigger = find(trigger, classname, "trigger_multiple")); )
+ for(targ = NULL; (targ = find(targ, targetname, trigger.target)); )
if (targ.classname == "target_init" || targ.classname == "target_give" || targ.classname == "target_items")
{
trigger.wait = 0;
spawnfunc(target_init)
{
- self.spawnflags = 0; // remove all weapons except the ones listed below
- self.netname = "shotgun"; // keep these weapons through the remove trigger
+ this.spawnflags = 0; // remove all weapons except the ones listed below
+ this.netname = "shotgun"; // keep these weapons through the remove trigger
spawnfunc_target_items(this);
- InitializeEntity(self, target_init_verify, INITPRIO_FINDTARGET);
+ InitializeEntity(this, target_init_verify, INITPRIO_FINDTARGET);
}
// weapon give ent from defrag
-void target_give_init()
-{SELFPARAM();
- entity targ;
- for (targ = world; (targ = find(targ, targetname, self.target)); ) {
- if (targ.classname == "weapon_rocketlauncher" || targ.classname == "weapon_devastator") {
- self.ammo_rockets += targ.count * WEP_CVAR(devastator, ammo);
- self.netname = "devastator";
+void target_give_init(entity this)
+{
+ IL_EACH(g_items, it.targetname == this.target,
+ {
+ if (it.classname == "weapon_rocketlauncher" || it.classname == "weapon_devastator") {
+ this.ammo_rockets += it.count * WEP_CVAR(devastator, ammo);
+ this.netname = "devastator";
}
- else if (targ.classname == "weapon_plasmagun") {
- self.ammo_rockets += targ.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
- if(self.netname == "")
- self.netname = "hagar";
+ else if (it.classname == "weapon_plasmagun") {
+ this.ammo_rockets += it.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
+ if(this.netname == "")
+ this.netname = "hagar";
else
- self.netname = strcat(self.netname, " hagar");
+ this.netname = strcat(this.netname, " hagar");
}
- else if (targ.classname == "weapon_bfg") {
- self.ammo_cells += targ.count * WEP_CVAR_PRI(crylink, ammo);
- if(self.netname == "")
- self.netname = "crylink";
+ else if (it.classname == "weapon_bfg") {
+ this.ammo_cells += it.count * WEP_CVAR_PRI(crylink, ammo);
+ if(this.netname == "")
+ this.netname = "crylink";
else
- self.netname = strcat(self.netname, " crylink");
+ this.netname = strcat(this.netname, " crylink");
}
- else if (targ.classname == "weapon_grenadelauncher" || targ.classname == "weapon_mortar") {
- self.ammo_rockets += targ.count * WEP_CVAR_PRI(mortar, ammo); // WEAPONTODO
- if(self.netname == "")
- self.netname = "mortar";
+ else if (it.classname == "weapon_grenadelauncher" || it.classname == "weapon_mortar") {
+ this.ammo_rockets += it.count * WEP_CVAR_PRI(mortar, ammo); // WEAPONTODO
+ if(this.netname == "")
+ this.netname = "mortar";
else
- self.netname = strcat(self.netname, " mortar");
+ this.netname = strcat(this.netname, " mortar");
}
- else if (targ.classname == "item_armor_body")
- self.armorvalue = 100;
- else if (targ.classname == "item_health_mega")
- self.health = 200;
- //remove(targ); // removing ents in init functions causes havoc, workaround:
- targ.think = SUB_Remove_self;
- targ.nextthink = time;
- }
- self.spawnflags = 2;
+ else if (it.classname == "item_armor_body")
+ this.armorvalue = 100;
+ else if (it.classname == "item_health_mega")
+ this.health = 200;
+ //remove(it); // removing ents in init functions causes havoc, workaround:
+ setthink(it, SUB_Remove);
+ it.nextthink = time;
+ });
+ this.spawnflags = 2;
spawnfunc_target_items(this);
- InitializeEntity(self, target_init_verify, INITPRIO_FINDTARGET);
+ InitializeEntity(this, target_init_verify, INITPRIO_FINDTARGET);
}
spawnfunc(target_give)
{
- InitializeEntity(self, target_give_init, INITPRIO_FINDTARGET);
+ InitializeEntity(this, target_give_init, INITPRIO_FINDTARGET);
}
-//spawnfunc(item_flight) /* handled by buffs mutator or jetpack */
+//spawnfunc(item_flight) /* handled by jetpack */
//spawnfunc(item_haste) /* handled by buffs mutator */
//spawnfunc(item_health) /* handled in t_quake.qc */
//spawnfunc(item_health_large) /* handled in t_items.qc */
.float notq3a;
.float notta;
.string gametype;
-float DoesQ3ARemoveThisEntity()
-{SELFPARAM();
+bool DoesQ3ARemoveThisEntity(entity this)
+{
// Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
- if(self.notq3a)
+ if(this.notq3a)
if(!teamplay || g_tdm || g_ctf)
- return 1;
+ return true;
- if(self.notta)
+ if(this.notta)
if (!(!teamplay || g_tdm || g_ctf))
- return 1;
+ return true;
- if(self.notsingle)
+ if(this.notsingle)
if(maxclients == 1)
- return 1;
+ return true;
- if(self.notteam)
+ if(this.notteam)
if(teamplay)
- return 1;
+ return true;
- if(self.notfree)
+ if(this.notfree)
if(!teamplay)
- return 1;
+ return true;
- if(self.gametype)
+ if(this.gametype)
{
string gametypename;
// static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"}
if(maxclients == 1)
gametypename = "single";
// we do not have the other types (oneflag, obelisk, harvester, teamtournament)
- if(strstrofs(self.gametype, gametypename, 0) < 0)
- return 1;
+ if(strstrofs(this.gametype, gametypename, 0) < 0)
+ return true;
}
- return 0;
+ return false;
}
projects / xonotic / xonotic-data.pk3dir.git / blobdiff