- added start/end tiles

SVN-Revision: 688

diff --git a/data/images/worldmap/antarctica.stwt b/data/images/worldmap/antarctica.stwt
index 695a7d0..b7c8825 100644 (file)
--- a/data/images/worldmap/antarctica.stwt
+++ b/data/images/worldmap/antarctica.stwt
@@ -191,6 +191,81 @@
        (south #t)
        (west  #f)
        (east  #t))
+
+ ;; castle
+ (tile (id 49)
+       (image "castle1.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+ (tile (id 50)
+       (image "castle2.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+ (tile (id 51)
+       (image "castle3.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+
+ (tile (id 52)
+       (image "castle4.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+ (tile (id 53)
+       (image "castle5.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+ (tile (id 54)
+       (image "castle6.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+
+ (tile (id 55)
+       (image "castle7.png")
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+ (tile (id 56)
+       (image "castle8.png")
+       (stop  #t)
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #t))
+ (tile (id 57)
+       (image "castle9.png")
+       (stop  #f)
+       (north #f)
+       (south #f)
+       (west  #t)
+       (east  #t))
+
+ (tile (id 58)
+       (image "igloo1.png")
+       (stop #f)
+       (north #f)
+       (south #f)
+       (west  #f)
+       (east  #f))
+ (tile (id 59)
+       (image "igloo2.png")
+       (stop #t)
+       (north #f)
+       (south #t)
+       (west  #f)
+       (east  #f))
  )
 
 ;; EOF ;;

diff --git a/data/images/worldmap/castle1.png b/data/images/worldmap/castle1.png
new file mode 100644 (file)
index 0000000..d687f0d
Binary files /dev/null and b/data/images/worldmap/castle1.png differ

diff --git a/data/images/worldmap/castle2.png b/data/images/worldmap/castle2.png
new file mode 100644 (file)
index 0000000..0325d10
Binary files /dev/null and b/data/images/worldmap/castle2.png differ

diff --git a/data/images/worldmap/castle3.png b/data/images/worldmap/castle3.png
new file mode 100644 (file)
index 0000000..1ae15a4
Binary files /dev/null and b/data/images/worldmap/castle3.png differ

diff --git a/data/images/worldmap/castle4.png b/data/images/worldmap/castle4.png
new file mode 100644 (file)
index 0000000..a7cdd78
Binary files /dev/null and b/data/images/worldmap/castle4.png differ

diff --git a/data/images/worldmap/castle5.png b/data/images/worldmap/castle5.png
new file mode 100644 (file)
index 0000000..6d9d080
Binary files /dev/null and b/data/images/worldmap/castle5.png differ

diff --git a/data/images/worldmap/castle6.png b/data/images/worldmap/castle6.png
new file mode 100644 (file)
index 0000000..3ac71f2
Binary files /dev/null and b/data/images/worldmap/castle6.png differ

diff --git a/data/images/worldmap/castle7.png b/data/images/worldmap/castle7.png
new file mode 100644 (file)
index 0000000..f52a2f4
Binary files /dev/null and b/data/images/worldmap/castle7.png differ

diff --git a/data/images/worldmap/castle8.png b/data/images/worldmap/castle8.png
new file mode 100644 (file)
index 0000000..cdb48f8
Binary files /dev/null and b/data/images/worldmap/castle8.png differ

diff --git a/data/images/worldmap/castle9.png b/data/images/worldmap/castle9.png
new file mode 100644 (file)
index 0000000..84bdbce
Binary files /dev/null and b/data/images/worldmap/castle9.png differ

diff --git a/data/images/worldmap/igloo1.png b/data/images/worldmap/igloo1.png
new file mode 100644 (file)
index 0000000..83b70d1
Binary files /dev/null and b/data/images/worldmap/igloo1.png differ

diff --git a/data/images/worldmap/igloo2.png b/data/images/worldmap/igloo2.png
new file mode 100644 (file)
index 0000000..12633dd
Binary files /dev/null and b/data/images/worldmap/igloo2.png differ

diff --git a/data/levels/default/worldmap.stwm b/data/levels/default/worldmap.stwm
index 29ae13e..4b283fb 100644 (file)
--- a/data/levels/default/worldmap.stwm
+++ b/data/levels/default/worldmap.stwm
@@ -8,8 +8,8 @@
        9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  11 12 9  9  9  9  9  9  9  9  9  9  9  9  
        9  9  9  9  9  9  9  11 16 12 11 16 16 16 16 12 9  9  9  9  11 16 16 12 9  9  14 13 9  9  9  9  9  9  9  9  9  9  9  9  
        9  9  9  11 16 16 16 22 19 17 15 24 25 25 26 23 16 12 9  9  14 18 18 13 9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  9  
-       9  9  11 22 19 47 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9  9  9  9  9  9  11 16 16 16 16 12 9  9  9  9  9  9  9  9  
-       9  9  15 19 48 42 20 13 9  9  15 31 35 29 29 28 19 19 19 23 16 12 9  9  9  11 22 19 24 25 26 23 12 11 16 16 12 9  9  9  
+       9  9  11 22 58 19 19 20 18 13 15 31 32 32 34 26 19 23 16 12 9  9  9  9  9  9  11 16 16 16 16 12 9  9  9  9  9  9  9  9  
+       9  9  15 19 59 19 20 13 9  9  15 31 35 29 29 28 19 19 19 23 16 12 9  9  9  11 22 19 24 25 26 23 12 11 16 16 12 9  9  9  
        9  9  15 19 47 19 17 11 16 16 22 30 28 19 48 40 40 40 39 20 18 13 9  9  11 22 19 19 30 36 34 26 23 22 19 19 23 12 9  9  
        9  9  15 19 47 19 23 22 19 19 19 19 24 26 47 19 19 19 47 23 16 16 16 16 22 48 40 40 39 31 32 34 25 25 25 25 26 17 9  9  
        9  9  15 19 37 39 19 48 40 40 40 39 30 28 41 40 40 40 44 40 40 40 40 40 40 42 19 19 47 30 29 29 29 29 29 36 27 17 9  9  
@@ -21,15 +21,15 @@
        9  9  11 12 9  14 21 30 29 29 29 28 20 13 9  11 16 22 20 13 9  9  9  9  9  14 21 19 37 39 31 32 27 20 13 14 21 17 9  9  
        9  9  14 13 11 12 14 18 18 18 18 18 13 9  9  14 18 18 13 9  9  9  9  9  9  9  14 21 19 47 30 36 27 17 9  9  14 13 9  9  
        9  9  9  9  14 13 9  9  9  9  11 16 16 16 12 9  9  11 16 12 9  9  9  9  9  9  9  14 21 47 19 31 27 17 9  9  9  9  9  9  
-       9  9  9  9  9  9  9  11 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12 9  9  9  9  9  15 47 19 30 28 17 9  9  9  9  9  9  
-       9  9  9  11 16 16 16 22 19 19 19 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 9  9  9  9  9  9  
-       9  9  9  15 24 25 26 19 19 19 19 19 30 29 29 28 19 30 29 29 36 34 25 26 19 19 48 40 40 42 17 9  9  9  9  9  9  9  9  9  
-       9  9  9  15 31 32 27 40 40 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 19 19 47 20 18 18 13 9  9  9  9  9  9  9  9  9  
-       9  9  9  15 30 36 34 26 19 47 19 47 19 19 47 19 47 19 19 47 19 19 19 48 40 40 42 23 12 9  9  9  9  11 12 9  9  9  9  9  
-       9  9  9  14 21 30 29 28 19 37 40 42 19 19 47 19 47 19 19 47 19 19 19 47 19 19 24 26 17 9  9  9  9  14 13 9  9  9  9  9  
-       9  9  9  9  14 18 18 18 21 19 19 19 19 19 47 19 47 19 48 42 19 19 48 42 24 25 33 27 17 9  9  9  9  9  9  9  9  9  9  9  
-       9  9  9  9  9  9  9  9  14 21 19 24 25 26 37 40 42 19 47 19 19 19 47 19 30 29 36 27 17 9  9  9  9  9  9  9  9  9  9  9  
-       9  9  9  11 12 9  9  9  9  14 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 9  9  11 16 16 12 9  9  9  9  9  
+       9  9  9  9  9  11 16 16 16 16 22 24 25 26 23 16 16 22 19 23 16 16 12 9  9  9  9  9  15 47 19 30 28 17 9  9  9  9  9  9  
+       9  9  9  11 16 22 49 50 51 24 26 30 36 34 25 26 19 24 25 25 25 26 23 16 16 16 16 16 22 47 20 18 18 13 9  9  9  9  9  9  
+       9  9  9  15 24 26 52 53 54 30 28 19 30 29 29 28 19 30 29 29 36 34 25 26 19 19 48 40 40 42 17 9  9  9  9  9  9  9  9  9  
+       9  9  9  15 31 27 55 56 57 39 19 48 40 40 39 19 48 40 40 39 30 29 29 28 19 19 47 20 18 18 13 9  9  9  9  9  9  9  9  9  
+       9  9  9  15 31 34 25 26 19 47 19 47 19 19 47 19 47 19 19 47 19 19 19 48 40 40 42 23 12 9  9  9  9  11 12 9  9  9  9  9  
+       9  9  9  15 30 29 29 28 19 37 40 42 19 19 47 19 47 19 19 47 19 19 19 47 19 19 24 26 17 9  9  9  9  14 13 9  9  9  9  9  
+       9  9  9  14 18 18 18 18 21 24 26 19 19 19 47 19 47 19 48 42 19 19 48 42 24 25 33 27 17 9  9  9  9  9  9  9  9  9  9  9  
+       9  9  9  9  9  9  9  9  15 30 28 24 25 26 37 40 42 19 47 19 19 19 47 19 30 29 36 27 17 9  9  9  9  9  9  9  9  9  9  9  
+       9  9  9  11 12 9  9  9  14 18 21 30 36 34 25 26 19 19 37 40 40 40 42 19 20 21 30 28 17 9  9  11 16 16 12 9  9  9  9  9  
        9  9  9  14 13 9  9  9  9  9  14 21 31 32 32 34 25 25 25 25 26 19 19 20 13 14 18 18 13 9  9  14 21 19 23 12 9  9  9  9  
        9  9  9  9  9  9  9  9  9  9  9  15 30 29 29 29 29 29 29 29 28 19 20 13 11 12 9  9  9  9  9  9  14 18 18 13 9  9  9  9  
        9  9  9  9  9  9  9  9  9  9  9  14 18 18 18 18 18 18 18 18 18 18 13 9  14 13 9  9  9  9  9  9  9  9  9  9  9  9  9  9  
@@ -38,11 +38,11 @@
 
   (levels
     (level (name "world1/level1.stl")
-           (x 5)
-           (y 4))
+           (x 4)
+           (y 6))
     (level (name "world1/level2.stl")
            (x 4)
-           (y 7))
+           (y 8))
     (level (name "world1/level3.stl")
            (x 5)
            (y 11))
@@ -116,5 +116,6 @@
            (x 7)
            (y 20))
   )
+
 )
 

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index a098d2f..facad2f 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -158,7 +158,7 @@ Tux::Tux(WorldMap* worldmap_)
   sprite = new Surface(datadir +  "/images/worldmap/tux.png", USE_ALPHA);
   offset = 0;
   moving = false;
-  tile_pos.x = 5;
+  tile_pos.x = 4;
   tile_pos.y = 5;
   direction = NONE;
   input_direction = NONE;