reverted totally pointless commit of rmcruz. size does NOT contain the current power...

[supertux.git] / src / world.cpp

diff --git a/src/world.cpp b/src/world.cpp
index bd1cc93..2eca737 100644 (file)
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -32,6 +32,7 @@
 #include "level.h"
 #include "tile.h"
 #include "resources.h"
+#include "gameobjs.h"
 
 Surface* img_distro[4];
 
@@ -50,6 +51,7 @@ World::World(const std::string& filename)
 
   get_level()->load_gfx();
   activate_bad_guys();
+  activate_objects();
   activate_particle_systems();
   get_level()->load_song();
 
@@ -71,6 +73,7 @@ World::World(const std::string& subset, int level_nr)
 
   get_level()->load_gfx();
   activate_bad_guys();
+  activate_objects();
   activate_particle_systems();
   get_level()->load_song();
 
@@ -106,6 +109,9 @@ World::~World()
   for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
     delete *i;
 
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+    delete *i;
+
   for (ParticleSystems::iterator i = particle_systems.begin();
           i != particle_systems.end(); ++i)
     delete *i;
@@ -156,6 +162,17 @@ World::activate_bad_guys()
 }
 
 void
+World::activate_objects()
+{
+  for (std::vector< ObjectData<TrampolineData> >::iterator i = level->trampoline_data.begin();
+       i != level->trampoline_data.end();
+       ++i)
+  {
+    add_object<Trampoline, ObjectData<TrampolineData> >(*i);
+  }
+}
+
+void
 World::activate_particle_systems()
 {
   if (level->particle_system == "clouds")
@@ -178,21 +195,10 @@ World::draw()
   int y,x;
 
   /* Draw the real background */
+  drawgradient(level->bkgd_top, level->bkgd_bottom);
   if(level->img_bkgd)
-    {
-      // Tile background horizontally
-      int sx = (int)((float)scroll_x * ((float)level->bkgd_speed/100.0f)) % level->img_bkgd->w;
-      for (int i = 0; (i-1)*level->img_bkgd->w <= screen->w; i++)
-        {
-          level->img_bkgd->draw_part(i == 0 ? sx : 0, 0,
-                                     i == 0 ? 0 : (level->img_bkgd->w * i) - sx, 0,
-                                     i == 0 ? level->img_bkgd->w - sx : level->img_bkgd->w, level->img_bkgd->h);
-        }
-    }
-  else
-    {
-      drawgradient(level->bkgd_top, level->bkgd_bottom);
-    }
+      level->draw_bg();
+
     
   /* Draw particle systems (background) */
   std::vector<ParticleSystem*>::iterator p;
@@ -228,6 +234,9 @@ World::draw()
   for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
     (*i)->draw();
 
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+    (*i)->draw();
+
   tux.draw();
 
   for (unsigned int i = 0; i < bullets.size(); ++i)
@@ -293,6 +302,9 @@ World::action(double frame_ratio)
   for (BadGuys::iterator i = bad_guys.begin(); i != bad_guys.end(); ++i)
     (*i)->action(frame_ratio);
 
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+     (*i)->action(frame_ratio);
+
   /* update particle systems */
   std::vector<ParticleSystem*>::iterator p;
   for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
@@ -332,22 +344,19 @@ void World::scrolling(double frame_ratio)
 
   float tux_pos_y = tux.base.y + (tux.base.height/2);
 
-  if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
-    scroll_y = tux_pos_y - (screen->h - Y_SPACE);
-  else if (scroll_y > tux_pos_y - Y_SPACE)
-    scroll_y = tux_pos_y - Y_SPACE;
+  if(level->height > VISIBLE_TILES_Y-1 && !tux.dying)
+    {
+    if (scroll_y < tux_pos_y - (screen->h - Y_SPACE))
+      scroll_y = tux_pos_y - (screen->h - Y_SPACE);
+    else if (scroll_y > tux_pos_y - Y_SPACE)
+      scroll_y = tux_pos_y - Y_SPACE;
+    }
 
   // this code prevent the screen to scroll before the start or after the level's end
-  if(scroll_y < 0)
-    scroll_y = 0;
-  else if(scroll_y > level->height * 32 - screen->h)
+  if(scroll_y > level->height * 32 - screen->h)
     scroll_y = level->height * 32 - screen->h;
-
-  if (scroll_y < 0)
-  {
-    //std::cerr << "Level too short!!" << std::endl;
+  if(scroll_y < 0)
     scroll_y = 0;
-  }
 
   /* X-axis scrolling */
 
@@ -400,10 +409,10 @@ void World::scrolling(double frame_ratio)
   }
 
   // this code prevent the screen to scroll before the start or after the level's end
+  if(scroll_x > level->width * 32 - screen->w)
+    scroll_x = level->width * 32 - screen->w;
   if(scroll_x < 0)
     scroll_x = 0;
-  else if(scroll_x > level->width * 32 - screen->w)
-    scroll_x = level->width * 32 - screen->w;
 }
 
 void
@@ -490,6 +499,25 @@ World::collision_handler()
           upgrades[i].collision(&tux, CO_PLAYER, COLLISION_NORMAL);
         }
     }
+
+  // CO_TRAMPOLINE & (CO_PLAYER or CO_BADGUY)
+  for (Trampolines::iterator i = trampolines.begin(); i != trampolines.end(); ++i)
+  {
+    if (rectcollision((*i)->base, tux.base))
+    {
+      if (tux.previous_base.y < tux.base.y &&
+          tux.previous_base.y + tux.previous_base.height 
+          < (*i)->base.y + (*i)->base.height/2)
+      {
+        (*i)->collision(&tux, CO_PLAYER, COLLISION_SQUISH);
+      }
+      else if (tux.previous_base.y <= tux.base.y)
+      {
+        tux.collision(*i, CO_TRAMPOLINE);
+        (*i)->collision(&tux, CO_PLAYER, COLLISION_NORMAL);
+      }
+    }
+  }
 }
 
 void
@@ -544,6 +572,18 @@ World::add_bad_guy(float x, float y, BadGuyKind kind, bool stay_on_platform)
   return badguy;
 }
 
+template<class T, class U>
+T*
+World::add_object(U data)
+{
+  T* tobject = new T(data);
+
+  if (data.type == OBJ_TRAMPOLINE)
+    trampolines.push_back(tobject);
+
+  return tobject;
+}
+
 void
 World::add_upgrade(float x, float y, Direction dir, UpgradeKind kind)
 {
@@ -603,7 +643,7 @@ World::get_music_type()
 }
 
 /* Break a brick: */
-void
+bool
 World::trybreakbrick(float x, float y, bool small)
 {
   Level* plevel = get_level();
@@ -637,6 +677,7 @@ World::trybreakbrick(float x, float y, bool small)
           play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
           player_status.score = player_status.score + SCORE_DISTRO;
           player_status.distros++;
+          return true;
         }
       else if (!small)
         {
@@ -651,8 +692,12 @@ World::trybreakbrick(float x, float y, bool small)
           /* Get some score: */
           play_sound(sounds[SND_BRICK], SOUND_CENTER_SPEAKER);
           player_status.score = player_status.score + SCORE_BRICK;
+          
+          return true;
         }
     }
+
+  return false;
 }
 
 /* Empty a box: */