- fixed some more menu issues

- removed highscore loading from gameloop

SVN-Revision: 589

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 2d5a70d..4a29e0a 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -115,9 +115,6 @@ GameSession::restart_level()
     
   if (st_gl_mode != ST_GL_DEMO_GAME)
     {
-      if(st_gl_mode != ST_GL_TEST)
-        load_hs();
-
       if(st_gl_mode == ST_GL_PLAY || st_gl_mode == ST_GL_LOAD_LEVEL_FILE)
         levelintro();
     }

diff --git a/src/setup.cpp b/src/setup.cpp
index dca1cf2..26fdba3 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -463,7 +463,7 @@ bool process_load_game_menu()
 {
   int slot = load_game_menu->check();
 
-  if(slot != -1)
+  if(slot != -1 && load_game_menu->get_item(slot).kind == MN_ACTION)
     {
       WorldMapNS::WorldMap worldmap;