[Super-tux-commit] supertux/src menu.h,1.58,1.59 setup.cpp,1.71,1.72 worldmap.cpp,1.66,1.67

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15384/src

Modified Files:
	menu.h setup.cpp worldmap.cpp 
Log Message:
Made worldmap to save game on exit.
And removed Save menu item, it's useless, since the game automatically saves the game, and only confuses the player.

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- worldmap.cpp	2 May 2004 16:08:22 -0000	1.66
+++ worldmap.cpp	6 May 2004 15:09:47 -0000	1.67
@@ -743,12 +743,9 @@
             {
             case MNID_RETURNWORLDMAP: // Return to game
               break;
-            case MNID_SAVEGAME:
+            case MNID_QUITWORLDMAP: // Quit Worldmap
               if (!savegame_file.empty())
                 savegame(savegame_file);
-              break;
-                
-            case MNID_QUITWORLDMAP: // Quit Worldmap
               quit = true;
               break;
             }

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- menu.h	4 May 2004 22:16:11 -0000	1.58
+++ menu.h	6 May 2004 15:09:47 -0000	1.59
@@ -53,7 +53,6 @@
 
 enum WorldMapMenuIDs {
   MNID_RETURNWORLDMAP,
-  MNID_SAVEGAME,
   MNID_QUITWORLDMAP
   };
 

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- setup.cpp	6 May 2004 12:51:27 -0000	1.71
+++ setup.cpp	6 May 2004 15:09:47 -0000	1.72
@@ -467,7 +467,6 @@
   worldmap_menu->additem(MN_LABEL,"Pause",0,0);
   worldmap_menu->additem(MN_HL,"",0,0);
   worldmap_menu->additem(MN_ACTION,"Continue",0,0,MNID_RETURNWORLDMAP);
-  worldmap_menu->additem(MN_ACTION,"Save",0,0,MNID_SAVEGAME);
   worldmap_menu->additem(MN_GOTO,"Options",0,options_menu);
   worldmap_menu->additem(MN_HL,"",0,0);
   worldmap_menu->additem(MN_ACTION,"Quit Game",0,0,MNID_QUITWORLDMAP);