Merge branch 'master' into terencehill/hud_cleanups

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / item_key.qc

diff --git a/qcsrc/server/item_key.qc b/qcsrc/server/item_key.qc
index 8df6e3b46e18c58e472dbe3aed21ecddd0dd4061..8c5a06b320725657b56f0f54d4d3801c43a68adf 100644 (file)
--- 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 = "";
@@ -81,6 +81,12 @@ void item_key_touch()
        play2(other, self.noise);
 
        centerprint(other, self.message);
+
+       string oldmsg = self.message;
+       self.message = "";
+       activator = other;
+       SUB_UseTargets();
+       self.message = oldmsg;
 };
 
 /**