make gradient parsing a bit more robust

[supertux.git] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 7873929..9b32379 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -15,26 +15,29 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+#include <config.h>
+
 #include "misc.h"
+#include "app/globals.h"
 
-void MyConfig::customload(LispReader& reader)
+void MyConfig::customload(const lisp::Lisp& reader)
 {
-  reader.read_int ("keyboard-jump", keymap.jump);
-  reader.read_int ("keyboard-activate", keymap.activate);
-  reader.read_int ("keyboard-duck", keymap.duck);
-  reader.read_int ("keyboard-left", keymap.left);
-  reader.read_int ("keyboard-right", keymap.right);
-  reader.read_int ("keyboard-fire", keymap.fire);
+  reader.get("keyboard-up", keymap.up);
+  reader.get("keyboard-down", keymap.down);
+  reader.get("keyboard-left", keymap.left);
+  reader.get("keyboard-right", keymap.right);
+  reader.get("keyboard-jump", keymap.jump);
+  reader.get("keyboard-power", keymap.power);
 }
+
 void MyConfig::customsave(FILE * config)
 {
-  fprintf(config, "\t(keyboard-jump  %d)\n", keymap.jump);
-  fprintf(config, "\t(keyboard-duck  %d)\n", keymap.duck);
+  fprintf(config, "\t(keyboard-up  %d)\n", keymap.up);
+  fprintf(config, "\t(keyboard-down  %d)\n", keymap.down);
   fprintf(config, "\t(keyboard-left  %d)\n", keymap.left);
   fprintf(config, "\t(keyboard-right %d)\n", keymap.right);
-  fprintf(config, "\t(keyboard-fire  %d)\n", keymap.fire);
-  fprintf(config, "\t(keyboard-activate  %d)\n", keymap.activate);
-
+  fprintf(config, "\t(keyboard-jump  %d)\n", keymap.jump);
+  fprintf(config, "\t(keyboard-power  %d)\n", keymap.power);
 }
 
 void process_options_menu(void)
@@ -129,11 +132,10 @@ void st_menu(void)
   options_keys_menu->additem(MN_HL,"",0,0);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Left move"), 0,0, 0,&keymap.left);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Right move"), 0,0, 0,&keymap.right);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Up/Activate"), 0,0, 0,&keymap.up);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Down/Duck"), 0,0, 0,&keymap.down);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Jump"), 0,0, 0,&keymap.jump);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Duck"), 0,0, 0,&keymap.duck);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Activate"), 0, 0, 0,
-          &keymap.activate);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Power/Run"), 0,0, 0,&keymap.fire);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Power/Run"), 0,0, 0,&keymap.power);
   options_keys_menu->additem(MN_HL,"",0,0);
   options_keys_menu->additem(MN_BACK,_("Back"),0,0);