Merge branch 'master' into startup

[factor.git] / basis / game / input / input.factor

diff --git a/basis/game/input/input.factor b/basis/game/input/input.factor
index 25283df4bfb4515fb849386ab1e3bfdb653eaab4..261f19cb9e908689d869c9fa9a9f59238ab2f835 100755 (executable)
--- a/basis/game/input/input.factor
+++ b/basis/game/input/input.factor
@@ -75,9 +75,8 @@ SYMBOLS:
     get-controllers [ product-id = ] with filter ;
 : find-controller-instance ( product-id instance-id -- controller/f )
     get-controllers [
-        tuck
         [ product-id  = ]
-        [ instance-id = ] 2bi* and
+        [ instance-id = ] bi-curry bi* and
     ] with with find nip ;
 
 TUPLE: keyboard-state keys ;