Made transition to and from boat smoother

SVN-Revision: 3688

diff --git a/data/images/worldmap/common/boat/boat.sprite b/data/images/worldmap/common/boat/boat.sprite
index b3aeb53..a5a2642 100644 (file)
--- a/data/images/worldmap/common/boat/boat.sprite
+++ b/data/images/worldmap/common/boat/boat.sprite
@@ -1,42 +1,63 @@
 (supertux-sprite
   (action
+    (hitbox 6 41 0 0)
     (name "empty")
-    (images "boat_empty.png")
+    (images 
+      "boat_empty.png"
+    )
   )
   (action
+    (hitbox 6 41 0 0)
     (name "small-stop")
-(fps 5)
-    (images "boat_1.png"
-"boat_0.png")
+    (fps 5)
+    (images 
+      "boat_1.png"
+      "boat_0.png"
+    )
   )
   (action
+    (hitbox 6 41 0 0)
     (name "small-walking")
-(fps 5)
-    (images "boat_1.png"
-"boat_0.png")
+    (fps 5)
+    (images 
+      "boat_1.png"
+      "boat_0.png"
+    )
   )
   (action
+    (hitbox 6 41 0 0)
     (name "fire-stop")
-(fps 5)
-    (images "boat_1.png"
-"boat_0.png")
+    (fps 5)
+    (images 
+      "boat_1.png"
+      "boat_0.png"
+    )
   )
   (action
+    (hitbox 6 41 0 0)
     (name "fire-walking")
-(fps 5)
-    (images "boat_1.png"
-"boat_0.png")
+    (fps 5)
+    (images 
+      "boat_1.png"
+      "boat_0.png"
+    )
   )
   (action
+    (hitbox 6 41 0 0)
     (name "large-stop")
-(fps 5)
-    (images "boat_1.png"
-"boat_0.png")
+    (fps 5)
+    (images 
+      "boat_1.png"
+      "boat_0.png"
+    )
   )
   (action
+    (hitbox 6 41 0 0)
     (name "large-walking")
-(fps 5)
-    (images "boat_1.png"
-"boat_0.png")
+    (fps 5)
+    (images 
+      "boat_1.png"
+      "boat_0.png"
+    )
   )
 )

diff --git a/data/images/worldmap/common/boat/boat_0.png b/data/images/worldmap/common/boat/boat_0.png
index 1fa0574..5806d9c 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_0.png and b/data/images/worldmap/common/boat/boat_0.png differ

diff --git a/data/images/worldmap/common/boat/boat_1.png b/data/images/worldmap/common/boat/boat_1.png
index a34ae2e..00c8412 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_1.png and b/data/images/worldmap/common/boat/boat_1.png differ

diff --git a/data/images/worldmap/common/boat/boat_empty.png b/data/images/worldmap/common/boat/boat_empty.png
index dd3b6a9..fb877b2 100644 (file)
Binary files a/data/images/worldmap/common/boat/boat_empty.png and b/data/images/worldmap/common/boat/boat_empty.png differ

diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index ef32fb2..b4db66d 100644 (file)
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -55,7 +55,7 @@ SpriteChange::draw(DrawingContext& context)
 {
   if(in_stay_action && stay_action != "") {
     sprite->set_action(stay_action);
-    sprite->draw(context, pos * 32 + Vector(16, 16), LAYER_OBJECTS-1);
+    sprite->draw(context, pos * 32, LAYER_OBJECTS-1);
   }
 }