set 'world' when leaving iceicland

SVN-Revision: 4515

diff --git a/data/levels/world1/worldmap.stwm b/data/levels/world1/worldmap.stwm
index 2f02e6f..e994648 100644 (file)
--- a/data/levels/world1/worldmap.stwm
+++ b/data/levels/world1/worldmap.stwm
@@ -186,7 +186,8 @@
     )
     (special-tile
       (invisible-tile #t)
-      (script "fadeout_screen( 2 );")
+      (script "fadeout_screen( 2 );
+state.world <- \"levels/world2/worldmap.stwm\";")
       (x 54)
       (y 21)
     )

diff --git a/data/levels/world2/worldmap.stwm b/data/levels/world2/worldmap.stwm
index cb76e2d..86e708d 100644 (file)
--- a/data/levels/world2/worldmap.stwm
+++ b/data/levels/world2/worldmap.stwm
@@ -388,7 +388,8 @@
     )
     (special-tile
       (invisible-tile #t)
-      (script "fadeout_screen( 2 );")
+      (script "fadeout_screen( 2 );
+state.world <- \"levels/world1/worldmap.stwm\";")
       (x 8)
       (y 45)
     )

diff --git a/src/object/player.cpp b/src/object/player.cpp
index 8367bd6..004a838 100644 (file)
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -811,7 +811,7 @@ Player::draw(DrawingContext& context)
     return;
 
   // if Tux is above camera, draw little "air arrow" to show where he is x-wise
-  if (Sector::current() && Sector::current()->camera && (get_bbox().p2.y + 16 < Sector::current()->camera->get_translation().y)) {
+  if (Sector::current() && Sector::current()->camera && (get_bbox().p2.y - 16 < Sector::current()->camera->get_translation().y)) {
     float px = get_pos().x + (get_bbox().p2.x - get_bbox().p1.x - airarrow.get()->get_width()) / 2;
     float py = Sector::current()->camera->get_translation().y;
     py += std::min(((py - (get_bbox().p2.y + 16)) / 4), 16.0f);