Fixed trailing whitespaces in all(?) source files of supertux, also fixed some svn...

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

diff --git a/src/object/magicblock.hpp b/src/object/magicblock.hpp
index a0592b9..3509e73 100644 (file)
--- a/src/object/magicblock.hpp
+++ b/src/object/magicblock.hpp
@@ -1,11 +1,12 @@
 //  $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.
+//  on the block. The black block becomes solid, if any kind of
+//  light is above MIN_INTENSITY.
 //
 //  Copyright (C) 2006 Wolfgang Becker <uafr@gmx.de>
 //
@@ -43,9 +44,12 @@ private:
   float trigger_red;
   float trigger_green;
   float trigger_blue;
+  float solid_time;
+  float switch_delay; /**< seconds until switching solidity */
   Color color;
   Color light;
   Vector center;
+  bool black;
 };
 
 #endif