- fixed menu/logo overdraw problem

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 2b5d1f7..da8cdfa 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -46,6 +46,10 @@ static texture_type bkg_title;
 static texture_type logo;
 static texture_type img_choose_subset;
 
+static bool walking;
+static Player titletux;
+static timer_type random_timer;
+
 static SDL_Event event;
 static SDLKey key;
 static int frame, i;
@@ -61,6 +65,69 @@ void draw_background()
   texture_draw_bg(&bkg_title);
 }
 
+void draw_demo()
+{
+  /* DEMO begin */
+  /* update particle systems */
+  std::vector<ParticleSystem*>::iterator p;
+  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
+    {
+      (*p)->simulate(frame_ratio);
+    }
+
+  /* Draw particle systems (background) */
+  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
+    {
+      (*p)->draw(scroll_x, 0, 0);
+    }
+
+  /* Draw interactive tiles: */
+
+  for (int y = 0; y < 15; ++y)
+    {
+      for (int x = 0; x < 21; ++x)
+        {
+          drawshape(32*x - fmodf(scroll_x, 32), y * 32,
+                    current_level.ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
+        }
+    }
+
+  global_frame_counter++;
+  titletux.key_event(SDLK_RIGHT,DOWN);
+  
+  if(timer_check(&random_timer))
+    {
+      if(walking)
+        titletux.key_event(SDLK_UP,UP);
+      else
+        titletux.key_event(SDLK_UP,DOWN);
+    }
+  else
+    {
+      timer_start(&random_timer, rand() % 3000 + 3000);
+      walking = !walking;
+    }
+  
+  // Wrap around at the end of the level back to the beginnig
+  if(current_level.width * 32 - 320 < titletux.base.x)
+    {
+      titletux.base.x = titletux.base.x - (current_level.width * 32 - 640);
+      scroll_x = titletux.base.x - 320;
+    }
+
+  float last_tux_x_pos = titletux.base.x;
+  titletux.action();
+
+  // Jump if tux stays in the same position for one loop, ie. if he is
+  // stuck behind a wall
+  if (last_tux_x_pos == titletux.base.x)
+    walking = false;
+
+  titletux.draw();
+
+  /* DEMO end */
+}
+
 /* --- TITLE SCREEN --- */
 
 int title(void)
@@ -69,11 +136,11 @@ int title(void)
   string_list_type level_subsets;
   st_subset subset;
   level_subsets = dsubdirs("/levels", "info");
-  timer_type random_timer;
   timer_init(&random_timer, true);
-  bool walking = true;
-  Player titletux;
+
+  walking = true;
   titletux.init();
+
   st_pause_ticks_init();
 
   level_load(&current_level, (datadir + "/levels/misc/menu.stl").c_str());
@@ -149,59 +216,18 @@ int title(void)
 
       /* Draw the background: */
       draw_background();
+      draw_demo();
 
-      /* DEMO begin */
-      /* update particle systems */
-      std::vector<ParticleSystem*>::iterator p;
-      for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-        {
-          (*p)->simulate(frame_ratio);
-        }
-
-      /* Draw particle systems (background) */
-      for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-        {
-          (*p)->draw(scroll_x, 0, 0);
-        }
-
-      /* Draw interactive tiles: */
-
-      for (int y = 0; y < 15; ++y)
-        {
-          for (int x = 0; x < 21; ++x)
-            {
-              drawshape(32*x - fmodf(scroll_x, 32), y * 32,
-                        current_level.ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
-            }
-        }
-
-      global_frame_counter++;
-      titletux.key_event(SDLK_RIGHT,DOWN);
-
-      
-      if(timer_check(&random_timer))
-        {
-         if(walking)
-          titletux.key_event(SDLK_UP,UP);
-         else
-         titletux.key_event(SDLK_UP,DOWN);
-        }
-      else
-        {
-          timer_start(&random_timer, rand() % 3000 + 3000);
-         walking = !walking;
-        }
-
-      if(current_level.width * 32 - 320 < titletux.base.x)
-        {
-          titletux.base.x = 160;
-          scroll_x = 0;
-        }
-
-      titletux.action();
-      titletux.draw();
+      if (current_menu == main_menu)
+        texture_draw(&logo, 160, 30);
 
-      /* DEMO end */
+      text_draw(&white_small_text, 
+                " SuperTux " VERSION "\n"
+                "Copyright (c) 2003 SuperTux Devel Team\n"
+                "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+                "are welcome to redistribute it under certain conditions; see the file COPYING\n"
+                "for details.\n",
+                0, 420, 0);
 
       /* Draw the high score: */
       /*
@@ -320,8 +346,6 @@ int title(void)
           process_save_load_game_menu(false);
         }
 
-      texture_draw(&logo, 160, 30);
-
       mouse_cursor->draw();
       
       flipscreen();