[Super-tux-commit] supertux/src gameloop.cpp,1.47,1.48 gameloop.h,1.26,1.27 menu.cpp,1.26,1.27

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

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

Modified Files:
	gameloop.cpp gameloop.h menu.cpp 
Log Message:
- reduced menu fadness a bit (ie. balanced the edges)

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- menu.cpp	10 Apr 2004 18:56:17 -0000	1.26
+++ menu.cpp	10 Apr 2004 20:37:36 -0000	1.27
@@ -481,7 +481,7 @@
         }
     }
 
-  return (menu_width * 16 + 48);
+  return (menu_width * 16 + 24);
 }
 
 int Menu::height()
@@ -498,9 +498,9 @@
 
   /* Draw a transparent background */
   fillrect(pos_x - menu_width/2,
-           pos_y - 24*num_items/2,
-           menu_width,menu_height,
-           150,180,200,100);
+           pos_y - 24*num_items/2 - 10,
+           menu_width,menu_height + 20,
+           150,180,200,125);
 
   for(int i = 0; i < num_items; ++i)
     {

Index: gameloop.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gameloop.h	10 Apr 2004 20:26:13 -0000	1.26
+++ gameloop.h	10 Apr 2004 20:37:36 -0000	1.27
@@ -32,10 +32,13 @@
 class GameSession
 {
  private:
-    timer_type fps_timer, frame_timer;
+  timer_type fps_timer, frame_timer;
+
  public:
   GameSession(const char * subset, int levelnb, int mode);
-  int run();
+  int  run();
+  void draw();
+  int  action();
 };
 
 void  activate_bad_guys(Level* plevel);

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gameloop.cpp	10 Apr 2004 20:26:13 -0000	1.47
+++ gameloop.cpp	10 Apr 2004 20:37:36 -0000	1.48
@@ -296,7 +296,8 @@
 
 /* --- GAME ACTION! --- */
 
-int game_action(void)
+int
+GameSession::action()
 {
   unsigned int i;
 
@@ -464,7 +465,8 @@
 
 /* --- GAME DRAW! --- */
 
-void game_draw(void)
+void 
+GameSession::draw()
 {
   int y,x;
 
@@ -655,7 +657,7 @@
   while (SDL_PollEvent(&event))
   {}
 
-  game_draw();
+  draw();
   do
     {
       jump = false;
@@ -721,7 +723,7 @@
             frame_ratio = 1;
             while(z >= 1)
             {*/
-          if (game_action() == 0)
+          if (action() == 0)
             {
               /* == 0: no more lives */
               /* == -1: continues */
@@ -747,7 +749,7 @@
         game_draw();
         else
         jump = true;*/ /*FIXME: Implement this tweak right.*/
-      game_draw();
+      draw();
 
       /* Time stops in pause mode */
       if(game_pause || show_menu )
@@ -817,10 +819,8 @@
   return(quit);
 }
 
-
 /* Load graphics/sounds shared between all levels: */
-
-void loadshared(void)
+void loadshared()
 {
   int i;