Improved the door tile (see test/level11 for demo)

added an animated door (sprite name is "openingdoor"), needs to be added to the code

SVN-Revision: 1456

diff --git a/TODO b/TODO
index 6f5863e..b09a2de 100644 (file)
--- a/TODO
+++ b/TODO
@@ -75,6 +75,7 @@ L: low priority
 [L] fadein/out for intro/extro would be nice
 [L] we only have a global counter for multiple coin blocks. This should be handled
     per block.
+[L] Show level number on top of the screen when playing the level
 
 Beyond Milestone2
 -----------------

diff --git a/data/images/shared/door-1.png b/data/images/shared/door-1.png
new file mode 100644 (file)
index 0000000..3409a6e
Binary files /dev/null and b/data/images/shared/door-1.png differ

diff --git a/data/images/shared/door-2.png b/data/images/shared/door-2.png
new file mode 100644 (file)
index 0000000..dca9bfa
Binary files /dev/null and b/data/images/shared/door-2.png differ

diff --git a/data/images/shared/door-3.png b/data/images/shared/door-3.png
new file mode 100644 (file)
index 0000000..1c9e335
Binary files /dev/null and b/data/images/shared/door-3.png differ

diff --git a/data/images/shared/door-4.png b/data/images/shared/door-4.png
new file mode 100644 (file)
index 0000000..5bbff08
Binary files /dev/null and b/data/images/shared/door-4.png differ

diff --git a/data/images/shared/door-5.png b/data/images/shared/door-5.png
new file mode 100644 (file)
index 0000000..3e7db1c
Binary files /dev/null and b/data/images/shared/door-5.png differ

diff --git a/data/images/shared/door-6.png b/data/images/shared/door-6.png
new file mode 100644 (file)
index 0000000..9a346b3
Binary files /dev/null and b/data/images/shared/door-6.png differ

diff --git a/data/images/shared/door-7.png b/data/images/shared/door-7.png
new file mode 100644 (file)
index 0000000..6fab543
Binary files /dev/null and b/data/images/shared/door-7.png differ

diff --git a/data/images/shared/door-8.png b/data/images/shared/door-8.png
new file mode 100644 (file)
index 0000000..465c18d
Binary files /dev/null and b/data/images/shared/door-8.png differ

diff --git a/data/images/shared/door.png b/data/images/shared/door.png
deleted file mode 100644 (file)
index 9885755..0000000
Binary files a/data/images/shared/door.png and /dev/null differ

diff --git a/data/levels/test/level10.stl b/data/levels/test/level10.stl
index cdaecac..0516ad6 100644 (file)
--- a/data/levels/test/level10.stl
+++ b/data/levels/test/level10.stl
@@ -26,7 +26,7 @@
    0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
    0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
    0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
-   0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  102 140  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
+   0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  102 0 140  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
    0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
    0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  
    8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  8  9  0  0  0  0  0  0  0  0  0  10 11 11 11 11 11 11 11 11 11 11 12 0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  

diff --git a/data/levels/test/level11.stl b/data/levels/test/level11.stl
index 1a05185..0a6caf7 100644 (file)
--- a/data/levels/test/level11.stl
+++ b/data/levels/test/level11.stl
@@ -44,8 +44,8 @@
       (speed 0.5)
     )
     (door  
-     (x 800)
-     (y 256)
+     (x 832)
+     (y 320)
      (sector "another_world")
      (spawnpoint "main")
     )
@@ -85,7 +85,7 @@
       (spawnpoint "main")
     )
     (door
-      (x 2550)
+      (x 2582)
       (y 1280)
       (sector "main")
       (spawnpoint "main")

diff --git a/data/supertux.strf b/data/supertux.strf
index 42ec2ed..33fce3d 100644 (file)
--- a/data/supertux.strf
+++ b/data/supertux.strf
@@ -684,8 +684,20 @@
   ; Door
   (sprite (name "door")
           (x-hotspot 0)
-          (y-hotspot 0)
-          (images "shared/door.png")
+          (y-hotspot 64)
+          (images "shared/door-1.png")
+  )
+  (sprite (name "openingdoor")
+          (x-hotspot 0)
+          (y-hotspot 64)
+          (images "shared/door-1.png"
+          "shared/door-2.png"
+          "shared/door-3.png"
+          "shared/door-4.png"
+          "shared/door-5.png"
+          "shared/door-6.png"
+          "shared/door-7.png"
+          "shared/door-8.png")
   )
   
   ; Stomp