summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Thompson <dthompson2@worcester.edu>2013-07-21 22:19:01 -0400
committerDavid Thompson <dthompson2@worcester.edu>2013-07-21 22:19:01 -0400
commit1690105218d8ec77abc31bcbecfc6794a9be0a14 (patch)
tree23b0e0821c6eee6950e64cc1ceb06852fd1ba241
parentb1059d5af036c3968c8b85a88fb4ba745df6cb9c (diff)
Remove event-keycode and event-keymods.
-rw-r--r--2d/game-loop.scm16
1 files changed, 4 insertions, 12 deletions
diff --git a/2d/game-loop.scm b/2d/game-loop.scm
index 92eff2a..ef650d5 100644
--- a/2d/game-loop.scm
+++ b/2d/game-loop.scm
@@ -92,12 +92,12 @@
"Calls the relevant callback for the event."
(case (SDL:event:type e)
((key-down)
- (key-down-callback (event-keycode e)
- (event-keymods e)
+ (key-down-callback (SDL:event:key:keysym:sym e)
+ (SDL:event:key:keysym:mod e)
(SDL:event:key:keysym:unicode e)))
((key-up)
- (key-up-callback (event-keycode e)
- (event-keymods e)
+ (key-up-callback (SDL:event:key:keysym:sym e)
+ (SDL:event:key:keysym:mod e)
(SDL:event:key:keysym:unicode e)))
((mouse-motion)
(mouse-motion-callback (SDL:event:motion:state e)
@@ -114,14 +114,6 @@
(SDL:event:button:x e)
(SDL:event:button:y e)))))
-(define (event-keycode e)
- "Returns an integer keycode from an SDL event."
- (SDL:enum->number 'keysym (SDL:event:key:keysym:sym e)))
-
-(define (event-keymods e)
- "Returns an integer bitmask of keymods from an SDL event"
- (SDL:flags->number 'keyboard-modifier (SDL:event:key:keysym:mod e)))
-
;;;
;;; Update and Render
;;;