Implemented Yoshi's Island-style flapping (based on Wansti's code) and force-activate...

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

diff --git a/src/object/background.cpp b/src/object/background.cpp
index b03b05f..a353763 100644 (file)
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -16,16 +16,16 @@
 //  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 "background.h"
-#include "app/globals.h"
 #include "camera.h"
 #include "video/drawing_context.h"
 #include "lisp/lisp.h"
 #include "lisp/writer.h"
 #include "object_factory.h"
+#include "resources.h"
+#include "main.h"
 
 Background::Background()
   : type(INVALID), layer(LAYER_BACKGROUND0), image(0)
@@ -80,7 +80,7 @@ Background::write(lisp::Writer& writer)
 }
 
 void
-Background::action(float)
+Background::update(float)
 {
 }
 
@@ -103,7 +103,7 @@ Background::set_gradient(Color top, Color bottom)
   gradient_bottom = bottom;
 
   delete image;
-  image = new Surface(top, bottom, screen->w, screen->h);
+  image = new Surface(top, bottom, SCREEN_WIDTH, SCREEN_HEIGHT);
 }
 
 void
@@ -122,8 +122,8 @@ Background::draw(DrawingContext& context)
     int sy = int(-context.get_translation().y * speed) % image->h - image->h;
     context.push_transform();
     context.set_translation(Vector(0, 0));
-    for(int x = sx; x < screen->w; x += image->w)
-      for(int y = sy; y < screen->h; y += image->h)
+    for(int x = sx; x < SCREEN_WIDTH; x += image->w)
+      for(int y = sy; y < SCREEN_HEIGHT; y += image->h)
         context.draw_surface(image, Vector(x, y), layer);
     context.pop_transform();
   }