Notifications: strong references

[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 713fbf6c3df57e87a8c704e7916da1ba11e562b0..d1e1f32e429e53bb7c3a1d534860d00896e6ecdd 100644 (file)
--- a/qcsrc/server/item_key.qc
+++ b/qcsrc/server/item_key.qc
@@ -1,11 +1,10 @@
 #include "item_key.qh"
-#include "_all.qh"
 
 #include "../common/triggers/subs.qh"
 #include "../common/monsters/all.qh"
 #include "../common/notifications.qh"
 #include "../common/util.qh"
-#include "../warpzonelib/util_server.qh"
+#include "../lib/warpzone/util_server.qh"
 
 /*
 TODO:
@@ -40,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,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;
 };
 
 /**
@@ -162,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;
@@ -234,7 +239,7 @@ spawnfunc(item_key)
                self.message = strzone(strcat("You've picked up the ", self.netname, "!"));
 
        if (self.noise == "")
-               self.noise = SND(ITEMPICKUP);
+               self.noise = strzone(SND(ITEMPICKUP));
 
        // save the name for later
        item_keys_names[lowestbit(self.itemkeys)] = self.netname;