reduced flappinf strength a litte so that Tux doesn't get more than one tile of height

[supertux.git] / src / tile.cpp

diff --git a/src/tile.cpp b/src/tile.cpp
index 901dfcd..2befbbf 100644 (file)
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -24,7 +24,6 @@
 #include <iostream>
 #include <stdexcept>
 
-#include "app/globals.h"
 #include "lisp/lisp.h"
 #include "tile.h"
 #include "resources.h"
@@ -90,6 +89,10 @@ Tile::parse(const lisp::Lisp& reader)
   if(reader.get("slope-type", data)) {
     attributes |= SOLID | SLOPE;
   }
+  
+  if (!reader.get("alpha", alpha)) {
+       alpha = 255;
+  }
 
   const lisp::Lisp* images = reader.get_lisp("images");
   if(images)
@@ -106,7 +109,7 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
     if(cur->get_type() == lisp::Lisp::TYPE_STRING) {
       std::string file;
       cur->get(file);
-      imagespecs.push_back(ImageSpec(file, Rectangle(0, 0, 0, 0)));
+      imagespecs.push_back(ImageSpec(file, Rect(0, 0, 0, 0)));
     } else if(cur->get_type() == lisp::Lisp::TYPE_CONS && 
         cur->get_car()->get_type() == lisp::Lisp::TYPE_SYMBOL) {
       const lisp::Lisp* ptr = cur->get_cdr();
@@ -118,7 +121,7 @@ Tile::parse_images(const lisp::Lisp& images_lisp)
       ptr->get_car()->get(y); ptr = ptr->get_cdr();
       ptr->get_car()->get(w); ptr = ptr->get_cdr();
       ptr->get_car()->get(h);
-      imagespecs.push_back(ImageSpec(file, Rectangle(x, y, x+w, y+h)));
+      imagespecs.push_back(ImageSpec(file, Rect(x, y, x+w, y+h)));
     } else {
       std::cerr << "Expected string or list in images tag.\n";
       continue;
@@ -151,8 +154,7 @@ Tile::load_images(const std::string& tilesetpath)
   }
   if(editor_imagefile != "") {
     editor_image = new Surface(
-        get_resource_filename(
-          std::string("images/tilesets/") + editor_imagefile), true);
+        get_resource_filename(tilesetpath + editor_imagefile), true);
   }
 }
 
@@ -170,11 +172,15 @@ Tile::get_editor_image() const
 void
 Tile::draw(DrawingContext& context, const Vector& pos, int layer) const
 {
+  context.set_alpha(this->alpha);
+  
   if(images.size() > 1) {
     size_t frame = size_t(global_time * anim_fps) % images.size();
     context.draw_surface(images[frame], pos, layer);
   } else if (images.size() == 1) {
     context.draw_surface(images[0], pos, layer);
   }
+  
+  context.set_alpha(255);
 }