#include "item_key.qh"
#include "../common/triggers/subs.qh"
-#include "../common/monsters/all.qh"
+#include "../common/monsters/_mod.qh"
#include "../common/notifications/all.qh"
#include "../common/util.qh"
#include "../lib/warpzone/util_server.qh"
bool item_keys_usekey(entity l, entity p)
{
- float valid = l.itemkeys & p.itemkeys;
+ int valid = l.itemkeys & PS(p).itemkeys;
if (!valid) {
- // other has none of the needed keys
+ // player has none of the needed keys
return false;
} else if (l.itemkeys == valid) {
// ALL needed keys were given
/**
* Key touch handler.
*/
-void item_key_touch()
-{SELFPARAM();
- if (!IS_PLAYER(other))
+void item_key_touch(entity this, entity toucher)
+{
+ if (!IS_PLAYER(toucher))
return;
// player already picked up this key
- if (other.itemkeys & self.itemkeys)
+ if (PS(toucher).itemkeys & this.itemkeys)
return;
- other.itemkeys |= self.itemkeys;
- play2(other, self.noise);
+ PS(toucher).itemkeys |= this.itemkeys;
+ play2(toucher, this.noise);
- centerprint(other, self.message);
+ centerprint(toucher, this.message);
- string oldmsg = self.message;
- self.message = "";
- SUB_UseTargets(self, other, other); // TODO: should we be using other for the trigger here?
- self.message = oldmsg;
+ string oldmsg = this.message;
+ this.message = "";
+ SUB_UseTargets(this, toucher, toucher); // TODO: should we be using toucher for the trigger here?
+ this.message = oldmsg;
};
/**
* Spawn a key with given model, key code and color.
*/
-void spawn_item_key()
-{SELFPARAM();
- precache_model(self.model);
+void spawn_item_key(entity this)
+{
+ precache_model(this.model);
- if (self.spawnflags & 1) // FLOATING
- self.noalign = 1;
+ if (this.spawnflags & 1) // FLOATING
+ this.noalign = 1;
- if (self.noalign)
- self.movetype = MOVETYPE_NONE;
+ if (this.noalign)
+ set_movetype(this, MOVETYPE_NONE);
else
- self.movetype = MOVETYPE_TOSS;
+ set_movetype(this, MOVETYPE_TOSS);
- precache_sound(self.noise);
+ precache_sound(this.noise);
- self.mdl = self.model;
- self.effects = EF_LOWPRECISION;
- _setmodel(self, self.model);
- //setsize(self, '-16 -16 -24', '16 16 32');
- setorigin(self, self.origin + '0 0 32');
- setsize(self, '-16 -16 -56', '16 16 0');
- self.modelflags |= MF_ROTATE;
- self.solid = SOLID_TRIGGER;
+ this.mdl = this.model;
+ this.effects = EF_LOWPRECISION;
+ _setmodel(this, this.model);
+ //setsize(this, '-16 -16 -24', '16 16 32');
+ setorigin(this, this.origin + '0 0 32');
+ setsize(this, '-16 -16 -56', '16 16 0');
+ this.modelflags |= MF_ROTATE;
+ this.solid = SOLID_TRIGGER;
- if (!self.noalign)
+ if (!this.noalign)
{
// first nudge it off the floor a little bit to avoid math errors
- setorigin(self, self.origin + '0 0 1');
+ setorigin(this, this.origin + '0 0 1');
// note droptofloor returns false if stuck/or would fall too far
- droptofloor();
+ droptofloor(this);
}
- self.touch = item_key_touch;
+ settouch(this, item_key_touch);
};
vector _colormod;
// reject this entity if more than one key was set!
- if (self.itemkeys>0 && (self.itemkeys & (self.itemkeys-1)) != 0) {
- objerror("item_key.itemkeys must contain only 1 bit set specifying the key it represents!");
- remove(self);
+ if (this.itemkeys>0 && (this.itemkeys & (this.itemkeys-1)) != 0) {
+ objerror(this, "item_key.itemkeys must contain only 1 bit set specifying the key it represents!");
+ delete(this);
return;
}
// find default netname and colormod
- switch(self.itemkeys) {
+ switch(this.itemkeys) {
case BIT(0):
_netname = "GOLD key";
_colormod = '1 .9 0';
_netname = "FLUFFY PINK keycard";
_colormod = '1 1 1';
- if (self.netname == "") {
- objerror("item_key doesn't have a default name for this key and a custom one was not specified!");
- remove(self);
+ if (this.netname == "") {
+ objerror(this, "item_key doesn't have a default name for this key and a custom one was not specified!");
+ delete(this);
return;
}
break;
// find default model
string _model = string_null;
- if (self.itemkeys <= ITEM_KEY_BIT(2)) {
+ if (this.itemkeys <= ITEM_KEY_BIT(2)) {
_model = "models/keys/key.md3";
- } else if (self.itemkeys >= ITEM_KEY_BIT(3) && self.itemkeys <= ITEM_KEY_BIT(5)) {
+ } else if (this.itemkeys >= ITEM_KEY_BIT(3) && this.itemkeys <= ITEM_KEY_BIT(5)) {
_model = "models/keys/key.md3"; // FIXME: replace it by a keycard model!
- } else if (self.model == "") {
- objerror("item_key doesn't have a default model for this key and a custom one was not specified!");
- remove(self);
+ } else if (this.model == "") {
+ objerror(this, "item_key doesn't have a default model for this key and a custom one was not specified!");
+ delete(this);
return;
}
// set defailt netname
- if (self.netname == "")
- self.netname = _netname;
+ if (this.netname == "")
+ this.netname = _netname;
// set default colormod
- if (!self.colormod)
- self.colormod = _colormod;
+ if (!this.colormod)
+ this.colormod = _colormod;
// set default model
- if (self.model == "")
- self.model = _model;
+ if (this.model == "")
+ this.model = _model;
// set default pickup message
- if (self.message == "")
- self.message = strzone(strcat("You've picked up the ", self.netname, "!"));
+ if (this.message == "")
+ this.message = strzone(strcat("You've picked up the ", this.netname, "!"));
- if (self.noise == "")
- self.noise = strzone(SND(ITEMPICKUP));
+ if (this.noise == "")
+ this.noise = strzone(SND(ITEMPICKUP));
// save the name for later
- item_keys_names[lowestbit(self.itemkeys)] = self.netname;
+ item_keys_names[lowestbit(this.itemkeys)] = this.netname;
// put the key on the map
- spawn_item_key();
+ spawn_item_key(this);
}
/*QUAKED item_key1 (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING
projects / xonotic / xonotic-data.pk3dir.git / blobdiff