X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworld.cpp;h=6bbbfe92a53bf587aa5e05389ea8dd7a9df43c68;hb=36cc92dc67c4cfdaceed7d47a4aa6992b407d1df;hp=7e7c4e6eaa7fc0b6a5ba9df63cfb5478409ba9d8;hpb=82a761da8025c09c9eee2cf6753cc70c039046c0;p=supertux.git

diff --git a/src/world.cpp b/src/world.cpp
index 7e7c4e6ea..6bbbfe92a 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -22,7 +22,6 @@ texture_type img_distro[4];
 
 void bouncy_distro_init(bouncy_distro_type* pbouncy_distro, float x, float y)
 {
-  pbouncy_distro->base.alive = YES;
   pbouncy_distro->base.x = x;
   pbouncy_distro->base.y = y;
   pbouncy_distro->base.ym = -2;
@@ -30,56 +29,44 @@ void bouncy_distro_init(bouncy_distro_type* pbouncy_distro, float x, float y)
 
 void bouncy_distro_action(bouncy_distro_type* pbouncy_distro)
 {
-  if (pbouncy_distro->base.alive)
-    {
       pbouncy_distro->base.y = pbouncy_distro->base.y + pbouncy_distro->base.ym * frame_ratio;
 
       pbouncy_distro->base.ym += 0.1 * frame_ratio;
 
       if (pbouncy_distro->base.ym >= 0)
-        pbouncy_distro->base.alive = NO;
-    }
+       bouncy_distros.erase(static_cast<std::vector<bouncy_distro_type>::iterator>(pbouncy_distro));
 }
 
 void bouncy_distro_draw(bouncy_distro_type* pbouncy_distro)
 {
-  if (pbouncy_distro->base.alive)
-    {
       texture_draw(&img_distro[0],
                    pbouncy_distro->base.x - scroll_x,
                    pbouncy_distro->base.y,
                    NO_UPDATE);
-    }
 }
 
 void broken_brick_init(broken_brick_type* pbroken_brick, float x, float y, float xm, float ym)
 {
-  pbroken_brick->base.alive = YES;
   pbroken_brick->base.x = x;
   pbroken_brick->base.y = y;
   pbroken_brick->base.xm = xm;
   pbroken_brick->base.ym = ym;
-  timer_init(&pbroken_brick->timer,YES);
+  timer_init(&pbroken_brick->timer, true);
   timer_start(&pbroken_brick->timer,200);
 }
 
 void broken_brick_action(broken_brick_type* pbroken_brick)
 {
-  if (pbroken_brick->base.alive)
-    {
       pbroken_brick->base.x = pbroken_brick->base.x + pbroken_brick->base.xm * frame_ratio;
       pbroken_brick->base.y = pbroken_brick->base.y + pbroken_brick->base.ym * frame_ratio;
 
       if (!timer_check(&pbroken_brick->timer))
-        pbroken_brick->base.alive = NO;
-    }
+        broken_bricks.erase(static_cast<std::vector<broken_brick_type>::iterator>(pbroken_brick));
 }
 
 void broken_brick_draw(broken_brick_type* pbroken_brick)
 {
 SDL_Rect src, dest;
-  if (pbroken_brick->base.alive)
-    {
       src.x = rand() % 16;
       src.y = rand() % 16;
       src.w = 16;
@@ -91,12 +78,10 @@ SDL_Rect src, dest;
       dest.h = 16;
 
       texture_draw_part(&img_brick[0],src.x,src.y,dest.x,dest.y,dest.w,dest.h,NO_UPDATE);
-    }
 }
 
 void bouncy_brick_init(bouncy_brick_type* pbouncy_brick, float x, float y)
 {
-  pbouncy_brick->base.alive = YES;
   pbouncy_brick->base.x = x;
   pbouncy_brick->base.y = y;
   pbouncy_brick->offset = 0;
@@ -107,9 +92,6 @@ void bouncy_brick_init(bouncy_brick_type* pbouncy_brick, float x, float y)
 void bouncy_brick_action(bouncy_brick_type* pbouncy_brick)
 {
 
-  if (pbouncy_brick->base.alive)
-    {
-
       pbouncy_brick->offset = (pbouncy_brick->offset +
                                pbouncy_brick->offset_m * frame_ratio);
 
@@ -122,8 +104,7 @@ void bouncy_brick_action(bouncy_brick_type* pbouncy_brick)
       /* Stop bouncing? */
 
       if (pbouncy_brick->offset >= 0)
-        pbouncy_brick->base.alive = NO;
-    }
+        bouncy_bricks.erase(static_cast<std::vector<bouncy_brick_type>::iterator>(pbouncy_brick));
 }
 
 void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick)
@@ -131,8 +112,6 @@ void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick)
   int s;
   SDL_Rect dest;
   
-  if (pbouncy_brick->base.alive)
-    {
       if (pbouncy_brick->base.x >= scroll_x - 32 &&
           pbouncy_brick->base.x <= scroll_x + screen->w)
         {
@@ -156,37 +135,29 @@ void bouncy_brick_draw(bouncy_brick_type* pbouncy_brick)
                     pbouncy_brick->base.y + pbouncy_brick->offset,
                     pbouncy_brick->shape);
         }
-    }
 }
 
 void floating_score_init(floating_score_type* pfloating_score, float x, float y, int s)
 {
-  pfloating_score->base.alive = YES;
   pfloating_score->base.x = x;
   pfloating_score->base.y = y - 16;
-  timer_init(&pfloating_score->timer,YES);
+  timer_init(&pfloating_score->timer,true);
   timer_start(&pfloating_score->timer,1000);
   pfloating_score->value = s;
 }
 
 void floating_score_action(floating_score_type* pfloating_score)
 {
-  if (pfloating_score->base.alive)
-    {
       pfloating_score->base.y = pfloating_score->base.y - 2 * frame_ratio;
 
       if(!timer_check(&pfloating_score->timer))
-        pfloating_score->base.alive = NO;
-    }
+        floating_scores.erase(static_cast<std::vector<floating_score_type>::iterator>(pfloating_score));
 }
 
 void floating_score_draw(floating_score_type* pfloating_score)
 {
-  if (pfloating_score->base.alive)
-    {
       char str[10];
       sprintf(str, "%d", pfloating_score->value);
       text_draw(&gold_text, str, (int)pfloating_score->base.x + 16 - strlen(str) * 8, (int)pfloating_score->base.y, 1, NO_UPDATE);
-    }
 }