- added extro support to worldmap, crashes however, no idea why:

[supertux.git] / src / gameloop.cpp

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 0243bfc..b5857c9 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -121,7 +121,6 @@ GameSession::restart_level()
           world->get_tux()->base.y = best_reset_point.y;
         }
     }
-
     
   if (st_gl_mode != ST_GL_DEMO_GAME)
     {
@@ -158,7 +157,7 @@ GameSession::levelintro(void)
   white_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
   
   sprintf(str, "by %s", world->get_level()->author.c_str());
-  white_small_text->drawf(str, 0, 400, A_HMIDDLE, A_TOP, 1);
+  white_small_text->drawf(str, 0, 360, A_HMIDDLE, A_TOP, 1);
   
 
   flipscreen();
@@ -209,6 +208,43 @@ GameSession::process_events()
         tux.input.up    = UP; 
 
       last_x_pos = tux.base.x;
+
+      SDL_Event event;
+      while (SDL_PollEvent(&event))
+        {
+          /* Check for menu-events, if the menu is shown */
+          if (Menu::current())
+            {
+              Menu::current()->event(event);
+              st_pause_ticks_start();
+            }
+
+          switch(event.type)
+            {
+            case SDL_QUIT:        /* Quit event - quit: */
+              st_abort("Received window close", "");
+              break;
+              
+            case SDL_KEYDOWN:     /* A keypress! */
+              {
+                SDLKey key = event.key.keysym.sym;
+           
+                switch(key)
+                  {
+                  case SDLK_ESCAPE:    /* Escape: Open/Close the menu: */
+                    on_escape_press();
+                    break;
+                  default:
+                    break;
+                  }
+              }
+          
+            case SDL_JOYBUTTONDOWN:
+              if (event.jbutton.button == joystick_keymap.start_button)
+                on_escape_press();
+              break;
+            }
+        }
     }
   else
     {
@@ -371,43 +407,47 @@ GameSession::process_events()
     }
 }
 
-
 void
 GameSession::check_end_conditions()
 {
   Player* tux = world->get_tux();
 
   /* End of level? */
-  if (tux->base.x >= World::current()->get_level()->endpos + 32 * (get_level()->use_endsequence ? 22 : 10))
+  int endpos = (World::current()->get_level()->width-5) * 32;
+  Tile* endtile = collision_goal(tux->base);
+
+  // fallback in case the other endpositions don't trigger
+  if (tux->base.x >= endpos || (endtile && endtile->data >= 1)
+      || (end_sequence && !endsequence_timer.check()))
     {
       exit_status = LEVEL_FINISHED;
+      return;
     }
-  else if (tux->base.x >= World::current()->get_level()->endpos && !end_sequence)
+  else if(!end_sequence && endtile && endtile->data == 0)
     {
       end_sequence = true;
       last_x_pos = -1;
       music_manager->halt_music();
+      endsequence_timer.start(5000); // 5 seconds until we finish the map
     }
-  else
+  else if (!end_sequence && tux->is_dead())
     {
-      // Check End conditions
-      if (tux->is_dead())
-        {
-          player_status.lives -= 1;             
-    
-          if (player_status.lives < 0)
-            { // No more lives!?
-              if(st_gl_mode != ST_GL_TEST)
-                drawendscreen();
-              
-              exit_status = GAME_OVER;
-            }
-          else
-            { // Still has lives, so reset Tux to the levelstart
-              restart_level();
-            }
+      player_status.lives -= 1;             
+
+      if (player_status.lives < 0)
+        { // No more lives!?
+          if(st_gl_mode != ST_GL_TEST)
+            drawendscreen();
+          
+          exit_status = GAME_OVER;
+        }
+      else
+        { // Still has lives, so reset Tux to the levelstart
+          restart_level();
         }
-    } 
+
+      return;
+    }
 }
 
 void
@@ -491,8 +531,8 @@ GameSession::run()
   update_time = last_update_time = st_get_ticks();
 
   /* Clear screen: */
-  clearscreen(0, 0, 0);
-  updatescreen();
+//  clearscreen(0, 0, 0);
+//  updatescreen();
 
   // Eat unneeded events
   SDL_Event event;
@@ -574,8 +614,7 @@ GameSession::run()
             world->play_music(HERRING_MUSIC);
         }
       /* are we low on time ? */
-      else if (time_left.get_left() < TIME_WARNING
-         && (world->get_music_type() == LEVEL_MUSIC))
+      else if (time_left.get_left() < TIME_WARNING)
         {
           world->play_music(HURRYUP_MUSIC);
         }
@@ -626,18 +665,30 @@ GameSession::drawstatus()
       white_text->draw("Press ESC To Return",0,20,1);
     }
 
-  if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5)
-    {
-      sprintf(str, "%d", time_left.get_left() / 1000 );
-      white_text->draw("TIME", 224, 0, 1);
-      gold_text->draw(str, 304, 0, 1);
-    }
+  if(!time_left.check()) {
+    white_text->draw("TIME'S UP", 224, 0, 1);
+  } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
+    sprintf(str, "%d", time_left.get_left() / 1000 );
+    white_text->draw("TIME", 224, 0, 1);
+    gold_text->draw(str, 304, 0, 1);
+  }
 
   sprintf(str, "%d", player_status.distros);
   white_text->draw("COINS", screen->h, 0, 1);
   gold_text->draw(str, 608, 0, 1);
 
-  white_text->draw("LIVES", screen->h, 20, 1);
+  white_text->draw("LIVES", 480, 20);
+  if (player_status.lives >= 5)
+    {
+      sprintf(str, "%dx", player_status.lives);
+      gold_text->draw(str, 585, 20);
+      tux_life->draw(565+(18*3), 20);
+    }
+  else
+    {
+      for(int i= 0; i < player_status.lives; ++i)
+        tux_life->draw(565+(18*i),20);
+    }
 
   if(show_fps)
     {
@@ -645,11 +696,6 @@ GameSession::drawstatus()
       white_text->draw("FPS", screen->h, 40, 1);
       gold_text->draw(str, screen->h + 60, 40, 1);
     }
-
-  for(int i= 0; i < player_status.lives; ++i)
-    {
-      tux_life->draw(565+(18*i),20);
-    }
 }
 
 void
@@ -704,10 +750,24 @@ std::string slotinfo(int slot)
 {
   char tmp[1024];
   char slotfile[1024];
+  std::string title;
   sprintf(slotfile,"%s/slot%d.stsg",st_save_dir,slot);
 
+  lisp_object_t* savegame = lisp_read_from_file(slotfile);
+  if (savegame)
+    {
+      LispReader reader(lisp_cdr(savegame));
+      reader.read_string("title", &title);
+      lisp_free(savegame);
+    }
+
   if (access(slotfile, F_OK) == 0)
-    sprintf(tmp,"Slot %d - Savegame",slot);
+    {
+      if (!title.empty())
+        snprintf(tmp,1024,"Slot %d - %s",slot, title.c_str());
+      else
+        snprintf(tmp, 1024,"Slot %d - Savegame",slot);
+    }
   else
     sprintf(tmp,"Slot %d - Free",slot);