Included supertux.h stuff into it.

[supertux.git] / src / setup.cpp

diff --git a/src/setup.cpp b/src/setup.cpp
index 1e1b22b..589d129 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -397,7 +397,7 @@ void st_menu(void)
   
   options_controls_menu->additem(MN_LABEL,"Controls",0,0);
   options_controls_menu->additem(MN_HL,"",0,0);
-  options_controls_menu->additem(MN_CONTROLFIELD,"Move Right",tux.keymap.right,0);
+  //FIXME:options_controls_menu->additem(MN_CONTROLFIELD,"Move Right", tux.keymap.right,0);
   options_controls_menu->additem(MN_HL,"",0,0);
   options_controls_menu->additem(MN_BACK,"Back",0,0);
 
@@ -445,7 +445,7 @@ void update_load_save_game_menu(Menu* pmenu, int load)
         pmenu->item[i].kind = MN_ACTION;
       else
         pmenu->item[i].kind = MN_ACTION;
-      menu_item_change_text(&pmenu->item[i], tmp.c_str());
+      pmenu->item[i].change_text(tmp.c_str());
     }
 }
 
@@ -453,7 +453,7 @@ void process_save_game_menu()
 {
   int slot = save_game_menu->check();
   if (slot != -1)
-    savegame(slot - 1);
+    GameSession::current()->savegame(slot - 1);
 }
 
 bool process_load_game_menu()
@@ -475,7 +475,10 @@ bool process_load_game_menu()
           Menu::set_current(main_menu);
         }
       else
-        { // Slot contains a level, so load it
+        { 
+          puts("Warning: Loading games isn't supported at the moment");
+#if 0
+          // Slot contains a level, so load it
           if (game_started)
             {
               GameSession session("default",slot - 1,ST_GL_LOAD_GAME);
@@ -486,8 +489,9 @@ bool process_load_game_menu()
             }
           else
             {
-              loadgame(slot - 1);
+              //loadgame(slot - 1);
             }
+#endif
         }
       st_pause_ticks_stop();
       return true;