From: Ingo Ruhnke <grumbel@gmail.com>
Date: Sun, 3 Aug 2014 04:01:38 +0000 (+0200)
Subject: Rolled file back to version from master, due to improper merge
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=3546f9b659b3b2ec53b2bee45e6f81e755d9207f;p=supertux.git

Rolled file back to version from master, due to improper merge
---

diff --git a/src/object/bonus_block.cpp b/src/object/bonus_block.cpp
index 5d6afcfbe..83cab765c 100644
--- a/src/object/bonus_block.cpp
+++ b/src/object/bonus_block.cpp
@@ -422,49 +422,6 @@ BonusBlock::try_drop(Player *player)
       try_open(player);
       break;
     }
-
-    case CONTENT_STAR:
-    {
-      sector->add_object(new Star(get_pos() + Vector(0, 32), direction));
-      sound_manager->play("sounds/upgrade.wav");
-      break;
-    }
-
-    case CONTENT_1UP:
-    {
-      sector->add_object(new OneUp(get_pos(), DOWN));
-      sound_manager->play("sounds/upgrade.wav");
-      break;
-    }
-
-    case CONTENT_CUSTOM:
-    {
-      //TODO: non-portable trampolines could be moved to CONTENT_CUSTOM, but they should not drop
-      object->set_pos(get_pos() +  Vector(0, 32));
-      sector->add_object(object);
-      object = 0;
-      sound_manager->play("sounds/upgrade.wav");
-      break;
-    }
-
-    case CONTENT_SCRIPT:
-    { break; } // because scripts always run, this prevents default contents from being assumed
-
-    case CONTENT_LIGHT:
-    {
-      try_open(player);
-      break;
-    }
-    case CONTENT_TRAMPOLINE:
-    {
-      try_open(player);
-      break;
-    }
-    case CONTENT_RAIN:
-    {
-      try_open(player);
-      break;
-    }
     case CONTENT_EXPLODE:
     {
       hit_counter = 1; // multiple hits of coin explode is not allowed
@@ -480,20 +437,12 @@ BonusBlock::try_drop(Player *player)
     Sector::current()->run_script(stream, "powerup-script");
   }
 
-<<<<<<< HEAD
   if(countdown){ // only decrease hit counter if try_open was not called
     if(hit_counter == 1){
       sprite->set_action("empty");
     }else{
       hit_counter--;
     }
-=======
-  if(hit_counter <= 0 || contents == CONTENT_LIGHT){ //use 0 to allow infinite hits
-  }else if(hit_counter == 1){
-    sprite->set_action("empty");
-  }else{
-    hit_counter--;
->>>>>>> feature/sdl2
   }
 }