-renamed ViewPort to Camera

[supertux.git] / src / gameloop.cpp

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 0b86cb3..d42c205 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -53,6 +53,7 @@
 #include "tile.h"
 #include "particlesystem.h"
 #include "resources.h"
+#include "background.h"
 #include "music_manager.h"
 
 GameSession* GameSession::current_ = 0;
@@ -65,6 +66,7 @@ GameSession::GameSession(const std::string& subset_, int levelnb_, int mode)
   
   global_frame_counter = 0;
   game_pause = false;
+  fps_fps = 0;
 
   fps_timer.init(true);            
   frame_timer.init(true);
@@ -144,20 +146,18 @@ GameSession::levelintro(void)
   music_manager->halt_music();
   
   char str[60];
- 
-  if (get_level()->img_bkgd)
-    get_level()->draw_bg();
-  else
-    drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
+
+  Camera dummy;
+  world->background->draw(dummy, LAYER_BACKGROUND0);
 
   sprintf(str, "%s", world->get_level()->name.c_str());
-  gold_text->drawf(str, 0, 200, A_HMIDDLE, A_TOP, 1);
+  gold_text->drawf(str, 0, 220, A_HMIDDLE, A_TOP, 1);
 
   sprintf(str, "TUX x %d", player_status.lives);
-  white_text->drawf(str, 0, 224, A_HMIDDLE, A_TOP, 1);
+  white_text->drawf(str, 0, 240, A_HMIDDLE, A_TOP, 1);
   
   sprintf(str, "by %s", world->get_level()->author.c_str());
-  white_small_text->drawf(str, 0, 360, A_HMIDDLE, A_TOP, 1);
+  white_small_text->drawf(str, 0, 400, A_HMIDDLE, A_TOP, 1);
   
 
   flipscreen();
@@ -189,6 +189,16 @@ GameSession::on_escape_press()
     }
   else if (!Menu::current())
     {
+      /* Tell Tux that the keys are all down, otherwise
+        it could have nasty bugs, like going allways to the right
+        or whatever that key does */
+      Player& tux = *world->get_tux();
+      tux.key_event((SDLKey)keymap.jump, UP);
+      tux.key_event((SDLKey)keymap.duck, UP);
+      tux.key_event((SDLKey)keymap.left, UP);
+      tux.key_event((SDLKey)keymap.right, UP);
+      tux.key_event((SDLKey)keymap.fire, UP);
+
       Menu::set_current(game_menu);
       st_pause_ticks_start();
     }
@@ -263,18 +273,8 @@ GameSession::process_events()
           if (Menu::current())
             {
               Menu::current()->event(event);
-             if(!Menu::current())
-             st_pause_ticks_stop();
-
-            /* Tell Tux that the keys are all down, otherwise
-               it could have nasty bugs, like going allways to the right
-               or whatever that key does */
-            Player& tux = *world->get_tux();
-            tux.key_event((SDLKey)keymap.jump, UP);
-            tux.key_event((SDLKey)keymap.duck, UP);
-            tux.key_event((SDLKey)keymap.left, UP);
-            tux.key_event((SDLKey)keymap.right, UP);
-            tux.key_event((SDLKey)keymap.fire, UP);
+              if(!Menu::current())
+                st_pause_ticks_stop();
             }
           else
             {
@@ -660,8 +660,8 @@ GameSession::run()
 /* Bounce a brick: */
 void bumpbrick(float x, float y)
 {
-  World::current()->add_bouncy_brick(((int)(x + 1) / 32) * 32,
-                         (int)(y / 32) * 32);
+  World::current()->add_bouncy_brick(Vector(((int)(x + 1) / 32) * 32,
+                         (int)(y / 32) * 32));
 
   play_sound(sounds[SND_BRICK], SOUND_CENTER_SPEAKER);
 }
@@ -672,7 +672,7 @@ GameSession::drawstatus()
 {
   char str[60];
 
-  sprintf(str, "%d", player_status.score);
+  snprintf(str, 60, "%d", player_status.score);
   white_text->draw("SCORE", 0, 0, 1);
   gold_text->draw(str, 96, 0, 1);
 
@@ -719,10 +719,8 @@ GameSession::drawresultscreen(void)
 {
   char str[80];
 
-  if (get_level()->img_bkgd)
-    get_level()->draw_bg();
-  else
-    drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
+  Camera dummy;
+  world->background->draw(dummy, LAYER_BACKGROUND0);  
 
   blue_text->drawf("Result:", 0, 200, A_HMIDDLE, A_TOP, 1);