[Super-tux-commit] supertux/src gameloop.cpp,1.84,1.85 setup.cpp,1.43,1.44

[Ingo R. <gr...@us...>]

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

Modified Files:
	gameloop.cpp setup.cpp 
Log Message:
- fixed some more menu issues
- removed highscore loading from gameloop

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- setup.cpp	20 Apr 2004 11:37:10 -0000	1.43
+++ setup.cpp	20 Apr 2004 12:12:31 -0000	1.44
@@ -463,7 +463,7 @@
 {
   int slot = load_game_menu->check();
 
-  if(slot != -1)
+  if(slot != -1 && load_game_menu->get_item(slot).kind == MN_ACTION)
     {
       WorldMapNS::WorldMap worldmap;
 

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- gameloop.cpp	20 Apr 2004 11:09:33 -0000	1.84
+++ gameloop.cpp	20 Apr 2004 12:12:31 -0000	1.85
@@ -115,9 +115,6 @@
     
   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();
     }