fixed butt jump to work even when up-key is not pressed, added a little jump after...

[supertux.git] / src / level.cpp

diff --git a/src/level.cpp b/src/level.cpp
index ce2414f..ff38e8d 100644 (file)
--- a/src/level.cpp
+++ b/src/level.cpp
@@ -33,6 +33,7 @@
 #include "lispreader.h"
 #include "resources.h"
 #include "music_manager.h"
+#include "gameobjs.h"
 
 using namespace std;
 
@@ -232,7 +233,7 @@ Level::init_defaults()
   song_title = "Mortimers_chipdisko.mod";
   bkgd_image = "arctis.png";
   width      = 21;
-  height     = 15;
+  height     = 19;
   start_pos_x = 100;
   start_pos_y = 170;
   time_left  = 100;
@@ -391,15 +392,35 @@ Level::load(const std::string& filename)
             while (!lisp_nil_p(cur))
               {
                 lisp_object_t* data = lisp_car(cur);
+                std::string object_type = "";
 
-                BadGuyData bg_data;
-                bg_data.kind = badguykind_from_string(lisp_symbol(lisp_car(data)));
                 LispReader reader(lisp_cdr(data));
-                reader.read_int("x", &bg_data.x);
-                reader.read_int("y", &bg_data.y);
-                reader.read_bool("stay-on-platform", &bg_data.stay_on_platform);
+                reader.read_string("type", &object_type);
 
-                badguy_data.push_back(bg_data);
+                if (object_type == "badguy" || object_type == "")
+                {
+                  BadGuyData bg_data;
+                  bg_data.kind = badguykind_from_string(lisp_symbol(lisp_car(data)));
+                  reader.read_int("x", &bg_data.x);
+                  reader.read_int("y", &bg_data.y);
+                  reader.read_bool("stay-on-platform", &bg_data.stay_on_platform);
+
+                  badguy_data.push_back(bg_data);
+                }
+                else
+                {
+                    if (strcmp(lisp_symbol(lisp_car(data)),"trampoline") == 0)
+                    {
+                      ObjectData<TrampolineData> _trampoline_data;
+
+                      _trampoline_data.type = OBJ_TRAMPOLINE;
+                      reader.read_int("x", &_trampoline_data.x);
+                      reader.read_int("y", &_trampoline_data.y);
+                      reader.read_float("power", &_trampoline_data.type_specific.power);
+
+                      trampoline_data.push_back(_trampoline_data);
+                    }
+                }
 
                 cur = lisp_cdr(cur);
               }
@@ -743,10 +764,12 @@ void Level::draw_bg()
 {
   // Tile background horizontally
   int sx = (int)((float)scroll_x * ((float)bkgd_speed/100.0f)) % img_bkgd->w;
-  for (int i = 0; (i-1)*img_bkgd->w <= screen->w; i++)
-    img_bkgd->draw_part(i == 0 ? sx : 0, 0,
-                        i == 0 ? 0 : (img_bkgd->w * i) - sx, 0,
-                        i == 0 ? img_bkgd->w - sx : img_bkgd->w, img_bkgd->h);
+  int sy = (int)((float)scroll_y * ((float)bkgd_speed/100.0f)) % img_bkgd->h;
+  for (int x = 0; (x-1)*img_bkgd->w <= screen->w; x++)
+    for (int y = 0; (y-1)*img_bkgd->h <= screen->h; y++)
+      img_bkgd->draw_part(x == 0 ? sx : 0, y == 0 ? sy : 0,
+                        x == 0 ? 0 : (img_bkgd->w * x) - sx, y == 0 ? 0 : (img_bkgd->h * y) - sy,
+                        x == 0 ? img_bkgd->w - sx : img_bkgd->w, y == 0 ? img_bkgd->h - sy : img_bkgd->h);
 }
 
 void