-Apply door fix to hatch as well (evil code duplication here...)

-fix worldmap scrolling bug from last commit
-fix stalactites being drawn when not activated

SVN-Revision: 2312

diff --git a/data/images/supertux.strf b/data/images/supertux.strf
index eb0fae5..c421b58 100644 (file)
--- a/data/images/supertux.strf
+++ b/data/images/supertux.strf
@@ -1422,7 +1422,7 @@
 
   (sprite (name "hatch")
        (action
-          (name "default")
+          (name "normal")
           (x-offset 0)
           (y-offset 0)
           (images "shared/hatch-1.png"))

diff --git a/src/badguy/stalactite.cpp b/src/badguy/stalactite.cpp
index 788683b..1a0b367 100644 (file)
--- a/src/badguy/stalactite.cpp
+++ b/src/badguy/stalactite.cpp
@@ -82,6 +82,9 @@ Stalactite::kill_fall()
 void
 Stalactite::draw(DrawingContext& context)
 {
+  if(get_state() != STATE_ACTIVE)
+    return;
+    
   if(state == STALACTITE_SHAKING) {
     sprite->draw(context, get_pos() + Vector((rand() % 6)-3, 0), LAYER_OBJECTS);
   } else {

diff --git a/src/trigger/hatch.cpp b/src/trigger/hatch.cpp
index 6019642..fa8b55f 100644 (file)
--- a/src/trigger/hatch.cpp
+++ b/src/trigger/hatch.cpp
@@ -79,6 +79,7 @@ Hatch::action(float )
 {
   //Check if hatch animation is complete
   if(sprite->check_animation()) {
+    sprite->set_action("normal");
     GameSession::current()->respawn(target_sector, target_spawnpoint);
   }
 }

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 58dc152..b49ecaa 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -1063,7 +1063,7 @@ WorldMap::display()
     if (offset.y < screen->h - height*32) offset.y = screen->h - height*32;
   
     context.push_transform();
-    context.set_translation(offset);
+    context.set_translation(-offset);
     draw(context);
     context.pop_transform();
     get_input();