Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / object / magicblock.cpp

diff --git a/src/object/magicblock.cpp b/src/object/magicblock.cpp
index 1c7e3cc..f98fca2 100644 (file)
--- a/src/object/magicblock.cpp
+++ b/src/object/magicblock.cpp
@@ -1,18 +1,16 @@
-//  $Id$
-//
 //  SuperTux - MagicBlock
 //
-//  Magic Blocks are tile-like game objects that are sensitive to 
+//  Magic Blocks are tile-like game objects that are sensitive to
 //  lighting conditions. They are rendered in a color and
 //  will only be solid as long as light of the same color shines
 //  on the block.
 //
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
 //
-//  This program is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU General Public License
-//  as published by the Free Software Foundation; either version 2
-//  of the License, or (at your option) any later version.
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
 //
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,35 +18,31 @@
 //  GNU General Public License for more details.
 //
 //  You should have received a copy of the GNU General Public License
-//  along with this program; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include <config.h>
-#include <vector>
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "object/camera.hpp"
-#include "magicblock.hpp"
-#include "object_factory.hpp"
-#include "sprite/sprite_manager.hpp"
-#include "sector.hpp"
-#include "main.hpp"
+#include "object/magicblock.hpp"
+#include "sprite/sprite.hpp"
+#include "supertux/main.hpp"
+#include "supertux/object_factory.hpp"
+#include "supertux/sector.hpp"
 
 namespace {
-  const float MIN_INTENSITY = 0.8f;
-  const float ALPHA_SOLID = 0.7f;
-  const float ALPHA_NONSOLID = 0.3f;
-  const float MIN_SOLIDTIME = 1.0f;
-  const float SWITCH_DELAY = 0.1f; /**< seconds to wait for stable conditions until switching solidity */
+const float MIN_INTENSITY = 0.8f;
+const float ALPHA_SOLID = 0.7f;
+const float ALPHA_NONSOLID = 0.3f;
+const float MIN_SOLIDTIME = 1.0f;
+const float SWITCH_DELAY = 0.1f; /**< seconds to wait for stable conditions until switching solidity */
 }
 
-MagicBlock::MagicBlock(const lisp::Lisp& lisp)
-       : MovingSprite(lisp, "images/objects/magicblock/magicblock.sprite"),
-        is_solid(false), solid_time(0), switch_delay(0), light(1.0f,1.0f,1.0f)
+MagicBlock::MagicBlock(const Reader& lisp)
+  : MovingSprite(lisp, "images/objects/magicblock/magicblock.sprite"),
+    is_solid(false), solid_time(0), switch_delay(0), light(1.0f,1.0f,1.0f)
 {
   set_group(COLGROUP_STATIC);
   //get color from lisp
   std::vector<float> vColor;
-  lisp.get_vector("color", vColor );
+  lisp.get("color", vColor );
   color = Color( vColor );
 
   //all alpha to make the sprite still visible
@@ -73,7 +67,7 @@ MagicBlock::MagicBlock(const lisp::Lisp& lisp)
 void
 MagicBlock::update(float elapsed_time)
 {
-  //Check if center of this block is on screen. 
+  //Check if center of this block is on screen.
   //Don't update if not, because there is no light off screen.
   float screen_left = Sector::current()->camera->get_translation().x;
   float screen_top = Sector::current()->camera->get_translation().y;
@@ -88,10 +82,10 @@ MagicBlock::update(float elapsed_time)
   bool lighting_ok;
   if(black) {
     lighting_ok = (light.red >= trigger_red || light.green >= trigger_green
-      || light.blue >= trigger_blue);
+                   || light.blue >= trigger_blue);
   }else{
     lighting_ok = (light.red >= trigger_red && light.green >= trigger_green
-      && light.blue >= trigger_blue);
+                   && light.blue >= trigger_blue);
   }
 
   // overrule lighting_ok if switch_delay has not yet passed
@@ -144,14 +138,18 @@ MagicBlock::draw(DrawingContext& context){
   context.draw_filled_rect( get_bbox(), color, layer);
 }
 
+bool
+MagicBlock::collides(GameObject& /*other*/, const CollisionHit& /*hit*/)
+{
+  return is_solid;
+}
+
 HitResponse
 MagicBlock::collision(GameObject& /*other*/, const CollisionHit& /*hit*/)
 {
-  if(is_solid) {
-    return SOLID;
-  } else {
-    return PASSTHROUGH;
-  }
+  return SOLID;
 }
 
 IMPLEMENT_FACTORY(MagicBlock, "magicblock");
+
+/* EOF */