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.

SVN-Revision: 1007

diff --git a/src/menu.h b/src/menu.h
index 1ffefcb..641b68d 100644 (file)
--- a/src/menu.h
+++ b/src/menu.h
@@ -53,7 +53,6 @@ enum GameMenuIDs {
 
 enum WorldMapMenuIDs {
   MNID_RETURNWORLDMAP,
-  MNID_SAVEGAME,
   MNID_QUITWORLDMAP
   };
 

diff --git a/src/setup.cpp b/src/setup.cpp
index 36835e1..5118cfd 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -467,7 +467,6 @@ void st_menu(void)
   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);

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index cd91cb2..4a4fa39 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -743,12 +743,9 @@ WorldMap::update(float delta)
             {
             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;
             }