properly implement invisible blocks

[supertux.git] / src / background.h

diff --git a/src/background.h b/src/background.h
index 45af0e0..375343f 100644 (file)
--- a/src/background.h
+++ b/src/background.h
@@ -16,40 +16,55 @@
 //  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.
-#ifndef __BACKGROUND_H__
-#define __BACKGROUND_H__
 
-#include "texture.h"
-#include "game_object.h"
-#include "drawable.h"
+#ifndef SUPERTUX_BACKGROUND_H
+#define SUPERTUX_BACKGROUND_H
 
-enum {
-  BACKGROUND_GRADIENT,
-  BACKGROUND_IMAGE
-};
+#include "video/surface.h"
+#include "video/drawing_context.h"
+#include "special/game_object.h"
+#include "utils/lispreader.h"
+#include "serializable.h"
 
 class DisplayManager;
 
-class Background : public GameObject, public Drawable
+class Background : public GameObject, public Serializable
 {
 public:
-  Background(DisplayManager& displaymanager);
+  Background();
+  Background(LispReader& reader);
   virtual ~Background();
 
-  void set_image(Surface* image, float bkgd_speed);
+  virtual void write(LispWriter& writer);
+
+  void set_image(const std::string& name, float bkgd_speed);
 
   void set_gradient(Color top, Color bottom);
 
+  std::string get_image() const
+        { return imagefile; }
+  float get_speed() const
+        { return speed; }
+  Color get_gradient_top() const
+        { return gradient_top; }
+  Color get_gradient_bottom() const
+        { return gradient_bottom; }
+
   virtual void action(float elapsed_time);
 
-  virtual void draw(Camera& viewport, int layer);
+  virtual void draw(DrawingContext& context);
 
 private:
-  int bgtype;
+  enum Type {
+    INVALID, GRADIENT, IMAGE      
+  };
+  
+  Type type;
+  std::string imagefile;
   float speed;
   Surface* image;
   Color gradient_top, gradient_bottom;
 };
 
-#endif
+#endif /*SUPERTUX_BACKGROUND_H*/