[Pingus-CVS] [pingus] 3 new revisions pushed by address@hidden on 2011-10-21 17:18 GMT

[pingus]

3 new revisions:

Revision: 31ebc143d299
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 10:14:13 2011
Log:      Print keynames in debug mode
http://code.google.com/p/pingus/source/detail?r=31ebc143d299

Revision: dab3f156a326
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 10:14:48 2011
Log:      Changed default keymap to be centered around WASD
http://code.google.com/p/pingus/source/detail?r=dab3f156a326

Revision: aae32247931c
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 10:18:24 2011
Log:      Updated man-page to reflect new keymappings
http://code.google.com/p/pingus/source/detail?r=aae32247931c

==============================================================================
Revision: 31ebc143d299
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 10:14:13 2011
Log:      Print keynames in debug mode

http://code.google.com/p/pingus/source/detail?r=31ebc143d299

Modified:
 /src/engine/input/sdl_driver.cpp

=======================================
--- /src/engine/input/sdl_driver.cpp    Wed Sep  7 05:06:26 2011
+++ /src/engine/input/sdl_driver.cpp    Fri Oct 21 10:14:13 2011
@@ -39,7 +39,7 @@
     string2key[key_name] = static_cast<SDLKey>(i);

     // FIXME: Make the keynames somewhere user visible so that users can  
use them
-    // log_info("Key: '" << key_name << "'");
+    log_debug("Key: '" << key_name << "'");
   }
 }


==============================================================================
Revision: dab3f156a326
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 10:14:48 2011
Log:      Changed default keymap to be centered around WASD

http://code.google.com/p/pingus/source/detail?r=dab3f156a326

Modified:
 /data/controller/default.scm

=======================================
--- /data/controller/default.scm        Sun Sep 11 09:39:45 2011
+++ /data/controller/default.scm        Fri Oct 21 10:14:48 2011
@@ -10,7 +10,13 @@
     (up    (sdl:keyboard-button (key "up")))
     (down  (sdl:keyboard-button (key "down")))
     (left  (sdl:keyboard-button (key "left")))
-    (right (sdl:keyboard-button (key "right")))))
+    (right (sdl:keyboard-button (key "right"))))
+
+   (core:button-scroller
+    (up    (sdl:keyboard-button (key "w")))
+    (down  (sdl:keyboard-button (key "s")))
+    (left  (sdl:keyboard-button (key "a")))
+    (right (sdl:keyboard-button (key "d")))))

   (primary-button
     (sdl:mouse-button (button 1)))
@@ -20,28 +26,31 @@
     (sdl:mouse-button (button 3)))

   (pause-button
+   (sdl:keyboard-button (key "r"))
    (sdl:keyboard-button (key "p")))

   (fast-forward-button
-   (sdl:keyboard-button (key "f"))
    (sdl:keyboard-button (key "space")))

   (single-step-button
-   (sdl:keyboard-button (key "s")))
+   (sdl:keyboard-button (key "s"))
+   (sdl:keyboard-button (key "f")))

   (armageddon-button
-   (sdl:keyboard-button (key "a")))
+   (sdl:keyboard-button (key "backspace")))

   (escape-button
    (sdl:keyboard-button (key "escape")))

   (action-up-button
    (sdl:keyboard-button (key "q"))
+   (sdl:keyboard-button (key "page up"))
    (sdl:mouse-button (button 4)))

   (action-down-button
    (sdl:keyboard-button (key "e"))
    (sdl:keyboard-button (key "tab"))
+   (sdl:keyboard-button (key "page down"))
    (sdl:mouse-button (button 5)))

   (action-1-button  (sdl:keyboard-button (key "1")))

==============================================================================
Revision: aae32247931c
Author:   Ingo Ruhnke <address@hidden>
Date:     Fri Oct 21 10:18:24 2011
Log:      Updated man-page to reflect new keymappings

http://code.google.com/p/pingus/source/detail?r=aae32247931c

Modified:
 /doc/man/pingus.6
 /doc/man/pingus.xml

=======================================
--- /doc/man/pingus.6   Wed Oct 19 08:04:37 2011
+++ /doc/man/pingus.6   Fri Oct 21 10:18:24 2011
@@ -5,7 +5,7 @@
 \\$2 \(la\\$1\(ra\\$3
 ..
 .if \n(.g .mso www.tmac
-.TH "pingus " 6 "19 October 2011" 0.7.5 "User Commands"
+.TH "pingus " 6 "21 October 2011" 0.7.5 "User Commands"
 .SH NAME
 pingus
 \- A puzzle game where you have to save penguins
@@ -165,16 +165,19 @@
 controller config file, see \*(T<\fB\-\-controller\fR\*(T>
 and \*(T<\fIcontroller/default.scm\fR\*(T>.
 .TP
+W, A, S, D
+Scroll in the level
+.TP
 Space
-Activate fast-forward mode.
+Hold to ast-forward
 .TP
-P
+P, R
 Pause the game.
 .TP
-S
+S, F
 Advance the game by a single frame.
 .TP
-A
+Backspace
 Activate armageddon.
 .TP
 Escape
@@ -269,8 +272,8 @@
  
\*(T<\fIpingus\-go\-on\-a\-long\-journey\-in\-snowland\-grumbel.pingus\fR\*(T>).
 The filename should not reflect the actual level title, it
 simply should be unique and not conflict with other peoples
-levels. If you plan on building a whole levelset, name the levels after the
-levelset.
+levels. If you plan on building a whole levelset, name the
+levels after the levelset.
 .PP
 To submit a level send it to <\*(T<address@hidden(T>>.
 .SS PREFABS
=======================================
--- /doc/man/pingus.xml Wed Oct 19 08:04:37 2011
+++ /doc/man/pingus.xml Fri Oct 21 10:18:24 2011
@@ -347,17 +347,28 @@
         and <filename>controller/default.scm</filename>.
       </para>
       <variablelist>
+        <varlistentry>
+          <term><keycombo><keycap>W</keycap></keycombo></term>
+          <term><keycombo><keycap>A</keycap></keycombo></term>
+          <term><keycombo><keycap>S</keycap></keycombo></term>
+          <term><keycombo><keycap>D</keycap></keycombo></term>
+          <listitem>
+            <para>Scroll in the level</para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry>
           <term><keycombo><keycap>Space</keycap></keycombo></term>
           <listitem>
             <para>
-              Activate fast-forward mode.
+              Hold to ast-forward
             </para>
           </listitem>
         </varlistentry>

         <varlistentry>
           <term><keycombo><keycap>P</keycap></keycombo></term>
+          <term><keycombo><keycap>R</keycap></keycombo></term>
           <listitem>
             <para>
               Pause the game.
@@ -367,6 +378,7 @@

         <varlistentry>
           <term><keycombo><keycap>S</keycap></keycombo></term>
+          <term><keycombo><keycap>F</keycap></keycombo></term>
           <listitem>
             <para>
               Advance the game by a single frame.
@@ -375,7 +387,7 @@
         </varlistentry>

         <varlistentry>
-          <term><keycombo><keycap>A</keycap></keycombo></term>
+          <term><keycombo><keycap>Backspace</keycap></keycombo></term>
           <listitem>
             <para>
               Activate armageddon.