- memleak fix and menu fix from MatzeB

[supertux.git] / src / gameloop.cpp

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 24a5df3..d956b22 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -53,6 +53,7 @@
 #include "tile.h"
 #include "particlesystem.h"
 #include "resources.h"
+#include "music_manager.h"
 
 GameSession* GameSession::current_ = 0;
 
@@ -141,9 +142,14 @@ GameSession::~GameSession()
 void
 GameSession::levelintro(void)
 {
+  music_manager->halt_music();
+  
   char str[60];
-  /* Level Intro: */
-  clearscreen(0, 0, 0);
+ 
+  if (get_level()->img_bkgd)
+    get_level()->img_bkgd->draw(0, 0);
+  else
+    drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
 
   sprintf(str, "%s", world->get_level()->name.c_str());
   gold_text->drawf(str, 0, 200, A_HMIDDLE, A_TOP, 1);
@@ -380,7 +386,7 @@ GameSession::check_end_conditions()
     {
       end_sequenze = true;
       last_x_pos = -1;
-      halt_music();
+      music_manager->halt_music();
     }
   else
     {
@@ -631,7 +637,7 @@ GameSession::drawstatus()
     }
 
   sprintf(str, "%d", player_status.distros);
-  white_text->draw("DISTROS", screen->h, 0, 1);
+  white_text->draw("COINS", screen->h, 0, 1);
   gold_text->draw(str, 608, 0, 1);
 
   white_text->draw("LIVES", screen->h, 20, 1);
@@ -654,7 +660,10 @@ GameSession::drawendscreen()
 {
   char str[80];
 
-  clearscreen(0, 0, 0);
+  if (get_level()->img_bkgd)
+    get_level()->img_bkgd->draw(0, 0);
+  else
+    drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
 
   blue_text->drawf("GAMEOVER", 0, 200, A_HMIDDLE, A_TOP, 1);
 
@@ -675,14 +684,17 @@ GameSession::drawresultscreen(void)
 {
   char str[80];
 
-  clearscreen(0, 0, 0);
+  if (get_level()->img_bkgd)
+    get_level()->img_bkgd->draw(0, 0);
+  else
+    drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
 
   blue_text->drawf("Result:", 0, 200, A_HMIDDLE, A_TOP, 1);
 
   sprintf(str, "SCORE: %d", player_status.score);
   gold_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
 
-  sprintf(str, "DISTROS: %d", player_status.distros);
+  sprintf(str, "COINS: %d", player_status.distros);
   gold_text->drawf(str, 0, 256, A_HMIDDLE, A_TOP, 1);
 
   flipscreen();