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

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

diff --git a/src/object/background.hpp b/src/object/background.hpp
index 5af6b4b..ca97358 100644 (file)
--- a/src/object/background.hpp
+++ b/src/object/background.hpp
@@ -1,12 +1,10 @@
-//  $Id$
+//  SuperTux
+//  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  SuperTux -  A Jump'n Run
-//  Copyright (C) 2004 Matthias Braun <matze@braunis.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
@@ -14,32 +12,24 @@
 //  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.
-#ifndef SUPERTUX_BACKGROUND_H
-#define SUPERTUX_BACKGROUND_H
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef HEADER_SUPERTUX_OBJECT_BACKGROUND_HPP
+#define HEADER_SUPERTUX_OBJECT_BACKGROUND_HPP
 
-#include <memory>
-#include "video/surface.hpp"
+#include "supertux/game_object.hpp"
+#include "util/reader_fwd.hpp"
 #include "video/drawing_context.hpp"
-#include "game_object.hpp"
-#include "serializable.hpp"
 
 class DisplayManager;
 
-namespace lisp {
-class Lisp;
-}
-
-class Background : public GameObject, public Serializable
+class Background : public GameObject
 {
 public:
   Background();
-  Background(const lisp::Lisp& reader);
+  Background(const Reader& reader);
   virtual ~Background();
 
-  virtual void write(lisp::Writer& writer);
-
   void set_image(const std::string& name, float bkgd_speed);
 
   std::string get_image() const
@@ -61,8 +51,9 @@ private:
   float speed_y; /**< scroll-speed in vertical direction */
   std::auto_ptr<Surface> image_top; /**< image to draw above pos */
   std::auto_ptr<Surface> image; /**< image to draw, anchored at pos */
-  std::auto_ptr<Surface> image_bottom; /**< image to draw below pos+<screenheight> */
+  std::auto_ptr<Surface> image_bottom; /**< image to draw below pos+screenheight */
 };
 
 #endif /*SUPERTUX_BACKGROUND_H*/
 
+/* EOF */