Merged master

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / trigger / keylock.qh

diff --git a/qcsrc/common/triggers/trigger/keylock.qh b/qcsrc/common/triggers/trigger/keylock.qh
index b21145d429850370ccbae8407c9bbfdbd8ced465..904c3fa3d4a7404d5d4c0535fbc59858b2d6cc42 100644 (file)
--- a/qcsrc/common/triggers/trigger/keylock.qh
+++ b/qcsrc/common/triggers/trigger/keylock.qh
@@ -1,20 +1,10 @@
+#pragma once
+
 #ifdef CSQC
-void ent_keylock();
 bool item_keys_usekey(entity l, entity p)
 {
-       float valid = l.itemkeys & p.itemkeys;
-
-       if (!valid) {
-               // other has none of the needed keys
-               return false;
-       } else if (l.itemkeys == valid) {
-               // ALL needed keys were given
-               l.itemkeys = 0;
-               return true;
-       } else {
-               // only some of the needed keys were given
-               l.itemkeys &= ~valid;
-               return true;
-       }
+       int valid = (l.itemkeys & p.itemkeys); // TODO: itemkeys isn't networked or anything!
+       l.itemkeys &= ~valid; // only some of the needed keys were given
+       return valid != 0;
 }
 #endif