[Pingus-CVS] r3296 - in trunk/pingus: data/controller src/input

[grumbel at BerliOS]

Author: grumbel
Date: 2007-10-22 07:01:45 +0200 (Mon, 22 Oct 2007)
New Revision: 3296

Modified:
   trunk/pingus/data/controller/default.scm
   trunk/pingus/src/input/manager.cpp
Log:
- fixed action up/down bindings

Modified: trunk/pingus/data/controller/default.scm
===================================================================
--- trunk/pingus/data/controller/default.scm    2007-10-22 02:45:14 UTC (rev 
3295)
+++ trunk/pingus/data/controller/default.scm    2007-10-22 05:01:45 UTC (rev 
3296)
@@ -16,6 +16,7 @@
     (sdl:mouse-button (button 1)))
 
   (secondary-button
+    (sdl:mouse-button (button 2))
     (sdl:mouse-button (button 3)))
 
   (pause-button
@@ -26,52 +27,28 @@
    (sdl:keyboard-button (key "space")))
 
   (armageddon-button
-    (sdl:keyboard-button (key "a")))
+   (sdl:keyboard-button (key "a")))
 
   (escape-button
-    (sdl:keyboard-button (key "escape")))
+   (sdl:keyboard-button (key "escape")))
 
-;;   (scroller
-;;     (axis-scroller
-;;       (speed 1000)
-;;       (button-axis
-;;         (angle 90)
-;;         (key-button
-;;           (key "down"))
-;;         (key-button
-;;           (key "up")))
-;;       (button-axis
-;;         (angle 0)
-;;         (key-button
-;;           (key "right"))
-;;         (key-button
-;;           (key "left")))))
+  (action-up-button
+   (sdl:mouse-button (button 4)))
+  
+  (action-down-button
+   (sdl:keyboard-button (key "tab"))
+   (sdl:mouse-button (button 5)))
 
-;;   (action-buttons
-;;     (action-button (key-button (key 1)))
-;;     (action-button (key-button (key 2)))
-;;     (action-button (key-button (key 3)))
-;;     (action-button (key-button (key 4)))
-;;     (action-button (key-button (key 5)))
-;;     (action-button (key-button (key 6)))
-;;     (action-button (key-button (key 7)))
-;;     (action-button (key-button (key 8)))
-;;     (action-button (key-button (key 9)))
-;;     (action-button (key-button (key 0))))
-
-;;   (action-up
-;;     (multiple-button
-;;       (key-button
-;;         (key "prior"))
-;;       (mouse-button
-;;         (button 5))))
-
-;;   (action-down
-;;     (multiple-button
-;;       (key-button
-;;         (key "next"))
-;;       (mouse-button
-;;         (button 4))))
+  (action-1-button  (sdl:keyboard-button (key "1")))
+  (action-2-button  (sdl:keyboard-button (key "2")))
+  (action-3-button  (sdl:keyboard-button (key "3")))
+  (action-4-button  (sdl:keyboard-button (key "4")))
+  (action-5-button  (sdl:keyboard-button (key "5")))
+  (action-6-button  (sdl:keyboard-button (key "6")))
+  (action-7-button  (sdl:keyboard-button (key "7")))
+  (action-8-button  (sdl:keyboard-button (key "8")))
+  (action-9-button  (sdl:keyboard-button (key "9")))
+  (action-10-button (sdl:keyboard-button (key "0")))
   )
 
 ;; EOF ;;

Modified: trunk/pingus/src/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp  2007-10-22 02:45:14 UTC (rev 3295)
+++ trunk/pingus/src/input/manager.cpp  2007-10-22 05:01:45 UTC (rev 3296)
@@ -58,8 +58,10 @@
   desc.add_button("armageddon-button",   ARMAGEDDON_BUTTON);
   desc.add_button("pause-button",        PAUSE_BUTTON);
   desc.add_button("escape-button",       ESCAPE_BUTTON);
+
   desc.add_button("action-up-button",    ACTION_UP_BUTTON);
   desc.add_button("action-down-button",  ACTION_DOWN_BUTTON);
+
   desc.add_button("action-1-button",     ACTION_1_BUTTON);
   desc.add_button("action-2-button",     ACTION_2_BUTTON);
   desc.add_button("action-3-button",     ACTION_3_BUTTON);