[Super-tux-commit] supertux/src gameloop.cpp,1.79,1.80 high_scores.cpp,1.13,1.14 leveleditor.cpp,1.53,1.54 menu.cpp,1.37,1.38 menu.h,1.36,1.37 title.cpp,1.46,1.47 worldmap.cpp,1.35,1.36

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

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

Modified Files:
	gameloop.cpp high_scores.cpp leveleditor.cpp menu.cpp menu.h 
	title.cpp worldmap.cpp 
Log Message:
- removed menu_process_current()

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- menu.cpp	19 Apr 2004 19:06:44 -0000	1.37
+++ menu.cpp	19 Apr 2004 19:22:27 -0000	1.38
@@ -523,17 +523,6 @@
     }
 }
 
-/* --- MENU --- */
-/* Draw the current menu and execute the (menu)events */
-void menu_process_current()
-{
-  if(Menu::current())
-    {
-      Menu::current()->action();
-      Menu::current()->draw();
-    }
-}
-
 /* Check for menu event */
 void
 Menu::event(SDL_Event& event)

Index: menu.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- menu.h	19 Apr 2004 19:06:45 -0000	1.36
+++ menu.h	19 Apr 2004 19:22:27 -0000	1.37
@@ -132,9 +132,6 @@
 extern Menu* load_game_menu;
 extern Menu* save_game_menu;
 
-/* "Calculate" and draw the menu */
-void menu_process_current(void);
-
 #endif /*SUPERTUX_MENU_H*/
 
 /* Local Variables: */

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- leveleditor.cpp	19 Apr 2004 19:06:44 -0000	1.53
+++ leveleditor.cpp	19 Apr 2004 19:22:27 -0000	1.54
@@ -210,7 +210,9 @@
 
       if(Menu::current())
         {
-          menu_process_current();
+          Menu::current()->action();
+          Menu::current()->draw();
+
           if(Menu::current() == leveleditor_menu)
             {
               switch (leveleditor_menu->check())

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- title.cpp	19 Apr 2004 19:06:45 -0000	1.46
+++ title.cpp	19 Apr 2004 19:22:27 -0000	1.47
@@ -300,7 +300,10 @@
 
       /* Don't draw menu, if quit is true */
       if(!done)
-        menu_process_current();
+        {
+          Menu::current()->action();
+          Menu::current()->draw();
+        }
 
       if(Menu::current() == main_menu)
         {

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- worldmap.cpp	19 Apr 2004 19:06:45 -0000	1.35
+++ worldmap.cpp	19 Apr 2004 19:22:27 -0000	1.36
@@ -708,7 +708,8 @@
 
   if(Menu::current())
     {
-      menu_process_current();
+      Menu::current()->action();
+      Menu::current()->draw();
       mouse_cursor->draw();
     }
     flipscreen();

Index: high_scores.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/high_scores.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- high_scores.cpp	19 Apr 2004 19:06:44 -0000	1.13
+++ high_scores.cpp	19 Apr 2004 19:22:27 -0000	1.14
@@ -94,7 +94,9 @@
       sprintf(str, "%d", hs_score);
       yellow_nums->draw(str, 350, 170, 1, NO_UPDATE);
 
-      menu_process_current();
+      Menu::current()->action();
+      Menu::current()->draw();
+
       flipscreen();
 
       while(SDL_PollEvent(&event))

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- gameloop.cpp	19 Apr 2004 19:06:44 -0000	1.79
+++ gameloop.cpp	19 Apr 2004 19:22:26 -0000	1.80
@@ -381,7 +381,8 @@
 
   if(Menu::current())
     {
-      menu_process_current();
+      Menu::current()->action();
+      Menu::current()->draw();
       mouse_cursor->draw();
     }