use radix literals

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

diff --git a/basis/game/input/xinput/xinput.factor b/basis/game/input/xinput/xinput.factor
index 800b2c4720376451084509fbcbcd66eb7a9a52a5..034c9490856eac081447b71fe47117900a41f106 100644 (file)
--- a/basis/game/input/xinput/xinput.factor
+++ b/basis/game/input/xinput/xinput.factor
@@ -56,7 +56,7 @@ MACRO: map-index-compose ( seq quot -- seq )
 : fill-controller-state ( XINPUT_STATE -- controller-state )
     Gamepad>> controller-state new dup rot
     {
-        [ wButtons>> HEX: f bitand >pov swap pov<< ]
+        [ wButtons>> 0xf bitand >pov swap pov<< ]
         [ wButtons>> fill-buttons swap buttons<< ]
         [ sThumbLX>> >axis swap x<< ]
         [ sThumbLY>> >axis swap y<< ]
@@ -84,13 +84,13 @@ M: xinput-game-input-backend (close-game-input)
     FALSE XInputEnable ;
 
 M: xinput-game-input-backend (reset-game-input)
-    global [
+    [
         {
             +dinput+ +keyboard-device+ +keyboard-state+
             +controller-devices+ +controller-guids+
             +device-change-window+ +device-change-handle+
         } [ off ] each
-    ] bind ;
+    ] with-global ;
 
 M: xinput-game-input-backend get-controllers
     { 0 1 2 3 } ;