From 67eb0a833f3d5ec69a3fce5ffb8d915c7e182661 Mon Sep 17 00:00:00 2001
From: Ingo Ruhnke <grumbel@gmx.de>
Date: Tue, 20 Apr 2004 12:12:31 +0000
Subject: [PATCH] - fixed some more menu issues - removed highscore loading
 from gameloop

SVN-Revision: 589
---
 src/gameloop.cpp | 3 ---
 src/setup.cpp    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 2d5a70d6b..4a29e0a37 100644
--- 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 dca1cf2b2..26fdba326 100644
--- 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;
 
-- 
2.11.0