Changed egg shadow draw layer so it will no longer appear in front of bonusblocks...

[supertux.git] / src / control / joystick_config.cpp

diff --git a/src/control/joystick_config.cpp b/src/control/joystick_config.cpp
index e155cf1..b7d8b78 100644 (file)
--- a/src/control/joystick_config.cpp
+++ b/src/control/joystick_config.cpp
@@ -35,7 +35,7 @@ JoystickConfig::JoystickConfig() :
   bind_joybutton(0, 1, Controller::ACTION);
   bind_joybutton(0, 4, Controller::PEEK_LEFT);
   bind_joybutton(0, 5, Controller::PEEK_RIGHT);
-  bind_joybutton(0, 6, Controller::PAUSE_MENU);
+  bind_joybutton(0, 6, Controller::START);
 
   // Default joystick axis configuration
   bind_joyaxis(0, -1, Controller::LEFT);
@@ -155,12 +155,12 @@ JoystickConfig::bind_joybutton(JoyId joy_id, int button, Controller::Control con
 }
 
 void
-JoystickConfig::read(const lisp::Lisp* joystick_lisp)
+JoystickConfig::read(const lisp::Lisp& joystick_lisp)
 {
-  joystick_lisp->get("dead-zone", dead_zone);
-  joystick_lisp->get("jump-with-up", jump_with_up_joy);
+  joystick_lisp.get("dead-zone", dead_zone);
+  joystick_lisp.get("jump-with-up", jump_with_up_joy);
 
-  lisp::ListIterator iter(joystick_lisp);
+  lisp::ListIterator iter(&joystick_lisp);
   while(iter.next())
   {
     if (iter.item() == "map")