X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fitem_key.qc;h=5c7e30e36e7c78c58087722707750081360f7aad;hb=7ed6b5adc348af2a7094c85517e824c04e2005cd;hp=1b423f5020f5646312a3c0b8d7a14380bb073344;hpb=7072a9dc696dc5bd2a5a2c4c706c4a2f5c0a24c5;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index 1b423f502..5c7e30e36 100644
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -19,7 +19,7 @@ float item_keys_usekey(entity l, entity p) {
 		return TRUE;
 	} else {
 		// only some of the needed keys were given
-		l.itemkeys &~= valid;
+		l.itemkeys &= ~valid;
 		return TRUE;
 	}
 }
@@ -63,7 +63,7 @@ item_key
  * Key touch handler.
  */
 void item_key_touch(void) {
-	if (other.classname != "player")
+	if not(IS_PLAYER(other))
 		return;
 		
 	// player already picked up this key
@@ -318,7 +318,7 @@ void trigger_keylock_touch(void) {
 	started_delay = FALSE;
 	
 	// only player may trigger the lock
-	if (other.classname != "player")
+	if not(IS_PLAYER(other))
 		return;