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 eccfbd91c79b40b094290b40307754f95873589f..8c5a06b320725657b56f0f54d4d3801c43a68adf 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;
 };
 
 /**
@@ -103,7 +108,7 @@ void spawn_item_key()
 
        self.mdl = self.model;
        self.effects = EF_LOWPRECISION;
-       setmodel(self, self.model);
+       _setmodel(self, self.model);
        //setsize(self, '-16 -16 -24', '16 16 32');
        setorigin(self, self.origin + '0 0 32');
        setsize(self, '-16 -16 -56', '16 16 0');
@@ -148,8 +153,8 @@ This is the only correct way to put keys on the map!
 
 itemkeys MUST always have exactly one bit set.
 */
-void spawnfunc_item_key()
-{SELFPARAM();
+spawnfunc(item_key)
+{
        string _netname;
        vector _colormod;
 
@@ -234,7 +239,7 @@ void spawnfunc_item_key()
                self.message = strzone(strcat("You've picked up the ", self.netname, "!"));
 
        if (self.noise == "")
-               self.noise = "misc/itempickup.wav";
+               self.noise = SND(ITEMPICKUP);
 
        // save the name for later
        item_keys_names[lowestbit(self.itemkeys)] = self.netname;
@@ -255,11 +260,11 @@ FLOATING: the item will float in air, instead of aligning to the floor by fallin
 ---------NOTES----------
 Don't use this entity on new maps! Use item_key instead.
 */
-void spawnfunc_item_key1(void)
-{SELFPARAM();
-       self.classname = "item_key";
-       self.itemkeys = ITEM_KEY_BIT(1);
-       spawnfunc_item_key();
+spawnfunc(item_key1)
+{
+       this.classname = "item_key";
+       this.itemkeys = ITEM_KEY_BIT(1);
+       spawnfunc_item_key(this);
 };
 
 /*QUAKED item_key2 (0 .5 .8) (-16 -16 -24) (16 16 32) FLOATING
@@ -274,9 +279,9 @@ FLOATING: the item will float in air, instead of aligning to the floor by fallin
 ---------NOTES----------
 Don't use this entity on new maps! Use item_key instead.
 */
-void spawnfunc_item_key2(void)
-{SELFPARAM();
-       self.classname = "item_key";
-       self.itemkeys = ITEM_KEY_BIT(0);
-       spawnfunc_item_key();
+spawnfunc(item_key2)
+{
+       this.classname = "item_key";
+       this.itemkeys = ITEM_KEY_BIT(0);
+       spawnfunc_item_key(this);
 };