X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fitem_key.qc;h=c645c7facdce7515e3021c441bb586fdbfd1375a;hp=bf389377f726e8fdf0b907d71883a7d7fd7b0dc0;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=74cebbb48d9481bb83eccb4438283f319352cb74

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index bf389377f7..c645c7facd 100644
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -1,7 +1,7 @@
 #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"
@@ -17,10 +17,10 @@ TODO:
 
 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
@@ -68,24 +68,24 @@ item_key
 /**
  * Key touch handler.
  */
-void item_key_touch(entity this)
+void item_key_touch(entity this, entity toucher)
 {
-	if (!IS_PLAYER(other))
+	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;
 };
 
 /**
@@ -99,9 +99,9 @@ void spawn_item_key(entity this)
 		this.noalign = 1;
 
 	if (this.noalign)
-		this.movetype = MOVETYPE_NONE;
+		set_movetype(this, MOVETYPE_NONE);
 	else
-		this.movetype = MOVETYPE_TOSS;
+		set_movetype(this, MOVETYPE_TOSS);
 
 	precache_sound(this.noise);
 
@@ -119,7 +119,7 @@ void spawn_item_key(entity this)
 		// first nudge it off the floor a little bit to avoid math errors
 		setorigin(this, this.origin + '0 0 1');
 		// note droptofloor returns false if stuck/or would fall too far
-		WITHSELF(this, droptofloor());
+		droptofloor(this);
 	}
 
 	settouch(this, item_key_touch);
@@ -159,8 +159,8 @@ spawnfunc(item_key)
 
 	// reject this entity if more than one key was set!
 	if (this.itemkeys>0 && (this.itemkeys & (this.itemkeys-1)) != 0) {
-		objerror("item_key.itemkeys must contain only 1 bit set specifying the key it represents!");
-		remove(this);
+		objerror(this, "item_key.itemkeys must contain only 1 bit set specifying the key it represents!");
+		delete(this);
 		return;
 	}
 
@@ -201,8 +201,8 @@ spawnfunc(item_key)
 		_colormod = '1 1 1';
 
 		if (this.netname == "") {
-			objerror("item_key doesn't have a default name for this key and a custom one was not specified!");
-			remove(this);
+			objerror(this, "item_key doesn't have a default name for this key and a custom one was not specified!");
+			delete(this);
 			return;
 		}
 		break;
@@ -216,8 +216,8 @@ spawnfunc(item_key)
 	} 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 (this.model == "") {
-		objerror("item_key doesn't have a default model for this key and a custom one was not specified!");
-		remove(this);
+		objerror(this, "item_key doesn't have a default model for this key and a custom one was not specified!");
+		delete(this);
 		return;
 	}