X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fitem_key.qc;h=e939a5faac4196a2378ef7111a1523f04e4dae70;hb=fbbd6e567b89e6a2f5f4b9c134fbd3d809ae026d;hp=317b897b0c8a98d922b9ff49c4f30a48271d15b9;hpb=8ba1f6c672361186033b8bebc3be677ac94bd4da;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index 317b897b0..e939a5faa 100644
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -1,7 +1,8 @@
 #include "item_key.qh"
 
-#include "../common/triggers/subs.qh"
-#include "../common/monsters/all.qh"
+#include "../common/mapobjects/subs.qh"
+#include <common/mapobjects/triggers.qh>
+#include "../common/monsters/_mod.qh"
 #include "../common/notifications/all.qh"
 #include "../common/util.qh"
 #include "../lib/warpzone/util_server.qh"
@@ -17,10 +18,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,23 +69,23 @@ 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 & this.itemkeys)
+	if (PS(toucher).itemkeys & this.itemkeys)
 		return;
 
-	other.itemkeys |= this.itemkeys;
-	play2(other, this.noise);
+	PS(toucher).itemkeys |= this.itemkeys;
+	play2(toucher, this.noise);
 
-	centerprint(other, this.message);
+	centerprint(toucher, this.message);
 
 	string oldmsg = this.message;
 	this.message = "";
-	SUB_UseTargets(this, other, other); // TODO: should we be using other for the trigger here?
+	SUB_UseTargets(this, toucher, toucher); // TODO: should we be using toucher for the trigger here?
 	this.message = oldmsg;
 };
 
@@ -99,9 +100,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);
 
@@ -160,7 +161,7 @@ spawnfunc(item_key)
 	// reject this entity if more than one key was set!
 	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!");
-		remove(this);
+		delete(this);
 		return;
 	}
 
@@ -202,7 +203,7 @@ spawnfunc(item_key)
 
 		if (this.netname == "") {
 			objerror(this, "item_key doesn't have a default name for this key and a custom one was not specified!");
-			remove(this);
+			delete(this);
 			return;
 		}
 		break;
@@ -217,7 +218,7 @@ spawnfunc(item_key)
 		_model = "models/keys/key.md3"; // FIXME: replace it by a keycard model!
 	} else if (this.model == "") {
 		objerror(this, "item_key doesn't have a default model for this key and a custom one was not specified!");
-		remove(this);
+		delete(this);
 		return;
 	}