X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=016b13df30414774543a15058c0ddeffd6a4a4a2;hb=e147eea9f117721dbcf79d1465452b6ae91fe33c;hp=729851b8187651c2f1e7f32053876a8c9c5ccfdc;hpb=69ab58f652b9ee0b981d01d79ae74b5371418746;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 729851b81..016b13df3 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -38,16 +38,14 @@
 #include "scene.h"
 #include "player.h"
 #include "math.h"
-
-void loadshared(void);
-void activate_particle_systems(void);
+#include "tile.h"
+#include "resources.h"
 
 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;
@@ -65,89 +63,92 @@ void draw_background()
   texture_draw_bg(&bkg_title);
 }
 
-void draw_demo()
+void draw_demo(GameSession* session, double frame_ratio)
 {
-  /* DEMO begin */
-  /* update particle systems */
+  World::set_current(session->get_world());
+  //World* world  = session->get_world();
+  Level* plevel = session->get_level();
+  Player* tux = session->get_world()->get_tux();
+  
+  /* FIXME:
+  // 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) */
+  // Draw particle systems (background)
   for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
     {
       (*p)->draw(scroll_x, 0, 0);
     }
+  */
 
-  /* Draw interactive tiles: */
-
+  // 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)]);
+          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
+                     plevel->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
         }
     }
 
   global_frame_counter++;
-  titletux.key_event(SDLK_RIGHT,DOWN);
+  tux->key_event(SDLK_RIGHT,DOWN);
   
-  if(timer_check(&random_timer))
+  if(random_timer.check())
     {
       if(walking)
-        titletux.key_event(SDLK_UP,UP);
+        tux->key_event(SDLK_UP,UP);
       else
-        titletux.key_event(SDLK_UP,DOWN);
+        tux->key_event(SDLK_UP,DOWN);
     }
   else
     {
-      timer_start(&random_timer, rand() % 3000 + 3000);
+      random_timer.start(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)
+  if(plevel->width * 32 - 320 < tux->base.x)
     {
-      titletux.base.x = titletux.base.x - (current_level.width * 32 - 640);
-      scroll_x = titletux.base.x - 320;
+      tux->base.x = tux->base.x - (plevel->width * 32 - 640);
+      scroll_x = tux->base.x - 320;
     }
 
-  float last_tux_x_pos = titletux.base.x;
-  titletux.action();
+
+
+  float last_tux_x_pos = tux->base.x;
+  tux->action(frame_ratio);
 
   // 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)
+  if (last_tux_x_pos == tux->base.x)
     walking = false;
 
-  titletux.draw();
+  tux->draw();
 
   /* DEMO end */
 }
 
 /* --- TITLE SCREEN --- */
-
-int title(void)
+bool title(void)
 {
-  int done;
   string_list_type level_subsets;
   st_subset subset;
   level_subsets = dsubdirs("/levels", "info");
-  timer_init(&random_timer, true);
+  random_timer.init(true);
 
   walking = true;
-  titletux.init();
 
   st_pause_ticks_init();
 
-  level_load(&current_level, (datadir + "/levels/misc/menu.stl").c_str());
+  GameSession session(datadir + "/levels/misc/menu.stl");
   loadshared();
-  activate_particle_systems();
-  /* Lower the gravity that tux doesn't jump to hectically through the demo */
-  //gravity = 5;
+
+  //FIXME:activate_particle_systems();
 
   /* Reset menu variables */
   menu_reset();
@@ -163,9 +164,7 @@ int title(void)
   texture_load(&img_choose_subset,datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
 
   /* --- Main title loop: --- */
-
-  done = 0;
-  quit = 0;
+  bool done = 0;
   show_menu = 1;
   frame = 0;
 
@@ -174,13 +173,12 @@ int title(void)
   load_hs();
 
   update_time = st_get_ticks();
-  timer_start(&random_timer, rand() % 2000 + 2000);
+  random_timer.start(rand() % 2000 + 2000);
 
-  while (!done && !quit)
+  while (!done)
     {
-
       /* Calculate the movement-factor */
-      frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
+      double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
       if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */
         frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85;
       /* Lower the frame_ratio that Tux doesn't jump to hectically throught the demo. */
@@ -193,13 +191,11 @@ int title(void)
           menu_event(event);
           if (event.type == SDL_QUIT)
             {
-              /* Quit event - quit: */
-              quit = 1;
+              done = true;
             }
           else if (event.type == SDL_KEYDOWN)
             {
               /* Keypress... */
-
               key = event.key.keysym.sym;
 
               /* Check for menu events */
@@ -208,16 +204,15 @@ int title(void)
               if (key == SDLK_ESCAPE)
                 {
                   /* Escape: Quit: */
-
-                  quit = 1;
+                  done = true;
                 }
             }
         }
 
       /* Draw the background: */
       draw_background();
-      draw_demo();
-
+      draw_demo(&session, frame_ratio);
+      
       if (current_menu == main_menu)
         texture_draw(&logo, 160, 30);
 
@@ -238,7 +233,7 @@ int title(void)
       */
 
       /* Don't draw menu, if quit is true */
-      if(show_menu && !quit)
+      if(show_menu && !done)
         menu_process_current();
 
       if(current_menu == main_menu)
@@ -277,8 +272,7 @@ int title(void)
                           switch(event.type)
                             {
                             case SDL_QUIT:
-                              done = 1;
-                              quit = 1;
+                              done = true;
                               break;
                             case SDL_KEYDOWN:		// key pressed
                               // Keypress...
@@ -334,13 +328,13 @@ int title(void)
               break;
             case 3:
               done = 1;
-              quit = leveleditor(1);
+              done = leveleditor(1);
               break;
             case 4:
               display_credits();
               break;
             case 5:
-              quit = 1;
+              done = true;
               break;
             }
         }
@@ -352,9 +346,10 @@ int title(void)
         {
           if (process_load_game_menu())
             {
+              // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
               // reset tux
               scroll_x = 0;
-              titletux.level_begin();
+              //titletux.level_begin();
               update_time = st_get_ticks();
             }
         }
@@ -383,8 +378,7 @@ int title(void)
   string_list_free(&level_subsets);
 
   /* Return to main! */
-
-  return(quit);
+  return done;
 }
 
 #define MAX_VEL 10
@@ -422,8 +416,8 @@ void display_credits()
     }
 
 
-  timer_init(&timer, SDL_GetTicks());
-  timer_start(&timer, 50);
+  timer.init(SDL_GetTicks());
+  timer.start(50);
 
   scroll = 0;
   speed = 2;
@@ -511,7 +505,7 @@ void display_credits()
       if(timer_get_left(&timer) < 0)
         {
           frame++;
-          timer_start(&timer, 50);
+          timer.start(50);
         }
     }
   string_list_free(&names);