Merge branch 'lab'

data/images/worldmap/common/boat/boat.sprite

@@ -60,4 +60,22 @@
       "boat_0.png"
     )
   )
+  (action
+    (hitbox 6 41 0 0)
+    (name "ice-stop")
+    (fps 5)
+    (images 
+      "boat_1_ice.png"
+      "boat_0_ice.png"
+    )
+  )
+  (action
+    (hitbox 6 41 0 0)
+    (name "ice-walking")
+    (fps 5)
+    (images 
+      "boat_1_ice.png"
+      "boat_0_ice.png"
+    )
+  )
 )

data/images/worldmap/common/tux.sprite

@@ -76,5 +76,29 @@
   (hitbox 0 10 0 0)
   (images "smalltux_fire.png")
  )
+  (action
+  (name "ice-walking")
+  (hitbox 0 10 0 0)
+  (images "smalltux_ice.png"
+          "smalltux2_ice.png"
+          "smalltux3_ice.png"
+          "smalltux4_ice.png"
+          "smalltux5_ice.png"
+          "smalltux6_ice.png"
+          "smalltux7_ice.png"
+          "smalltux8_ice.png"
+          "smalltux6_ice.png"
+          "smalltux5_ice.png"
+          "smalltux4_ice.png"
+          "smalltux3_ice.png"
+          "smalltux2_ice.png"
+          "smalltux1_ice.png"
+          "smalltux_ice.png")
+ )
+ (action
+  (name "ice-stop")
+  (hitbox 0 10 0 0)
+  (images "smalltux_ice.png")
+ )
 )
 

src/worldmap/tux.cpp

@@ -66,6 +66,9 @@ Tux::draw(DrawingContext& context)
     case FIRE_BONUS:
       sprite->set_action(moving ? "fire-walking" : "fire-stop");
       break;
+    case ICE_BONUS:
+      sprite->set_action(moving ? "ice-walking" : "ice-stop");
+      break;
     case NO_BONUS:
       sprite->set_action(moving ? "small-walking" : "small-stop");
       break;