X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fitem_key.qc;h=5ab3c8df22626eceb373246a94621684bb2e3ea7;hp=4b83a6bdb2545b42fea64d0882e85245ab7005ba;hb=46f7bde5d7554a7621f1285640946f01cb5e4016;hpb=67b3098c964ccee3a3d15b29a4300c14476ae43e

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index 4b83a6bdb..5ab3c8df2 100644
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -39,7 +39,7 @@ string item_keys_keylist(float keylist) {
 		return "";
 
 	// one key
-	if ((keylist & (keylist-1)) != 0)
+	if ((keylist & (keylist-1)) == 0)
 		return strcat("the ", item_keys_names[lowestbit(keylist)]);
 
 	string n = "";
@@ -82,8 +82,11 @@ void item_key_touch()
 
 	centerprint(other, self.message);
 
+	string oldmsg = self.message;
+	self.message = "";
 	activator = other;
 	SUB_UseTargets();
+	self.message = oldmsg;
 };
 
 /**
@@ -164,32 +167,32 @@ spawnfunc(item_key)
 
 	// find default netname and colormod
 	switch(self.itemkeys) {
-	case 1:
+	case BIT(0):
 		_netname = "GOLD key";
 		_colormod = '1 .9 0';
 		break;
 
-	case 2:
+	case BIT(1):
 		_netname = "SILVER key";
 		_colormod = '.9 .9 .9';
 		break;
 
-	case 4:
+	case BIT(2):
 		_netname = "BRONZE key";
 		_colormod = '.6 .25 0';
 		break;
 
-	case 8:
+	case BIT(3):
 		_netname = "RED keycard";
 		_colormod = '.9 0 0';
 		break;
 
-	case 16:
+	case BIT(4):
 		_netname = "BLUE keycard";
 		_colormod = '0 0 .9';
 		break;
 
-	case 32:
+	case BIT(5):
 		_netname = "GREEN keycard";
 		_colormod = '0 .9 0';
 		break;