From: Marek Moeckel Date: Wed, 20 Jul 2005 08:16:02 +0000 (+0000) Subject: moved and sorted worldmap tiles X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=87b7bf0359f2fb87234fdc9241c9e02320175daa;p=supertux.git moved and sorted worldmap tiles SVN-Revision: 2736 --- diff --git a/data/images/sprites.strf b/data/images/sprites.strf index 780db695e..054da592e 100644 --- a/data/images/sprites.strf +++ b/data/images/sprites.strf @@ -1600,17 +1600,17 @@ (action (name "small") (y-offset 10) - (images "tiles/worldmap/smalltux.png") + (images "worldmap/common/smalltux.png") ) (action (name "large") (y-offset 10) - (images "tiles/worldmap/tux.png") + (images "worldmap/common/tux.png") ) (action (name "fire") (y-offset 10) - (images "tiles/worldmap/firetux.png") + (images "worldmap/common/firetux.png") ) ) diff --git a/data/images/tiles/worldmap/castle1.png b/data/images/tiles/worldmap/castle1.png deleted file mode 100644 index d687f0d48..000000000 Binary files a/data/images/tiles/worldmap/castle1.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle2.png b/data/images/tiles/worldmap/castle2.png deleted file mode 100644 index 0325d10e0..000000000 Binary files a/data/images/tiles/worldmap/castle2.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle3.png b/data/images/tiles/worldmap/castle3.png deleted file mode 100644 index 1ae15a49b..000000000 Binary files a/data/images/tiles/worldmap/castle3.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle4.png b/data/images/tiles/worldmap/castle4.png deleted file mode 100644 index a7cdd78c0..000000000 Binary files a/data/images/tiles/worldmap/castle4.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle5.png b/data/images/tiles/worldmap/castle5.png deleted file mode 100644 index 6d9d080de..000000000 Binary files a/data/images/tiles/worldmap/castle5.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle6.png b/data/images/tiles/worldmap/castle6.png deleted file mode 100644 index 3ac71f2c8..000000000 Binary files a/data/images/tiles/worldmap/castle6.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle7.png b/data/images/tiles/worldmap/castle7.png deleted file mode 100644 index f52a2f4da..000000000 Binary files a/data/images/tiles/worldmap/castle7.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle8.png b/data/images/tiles/worldmap/castle8.png deleted file mode 100644 index cdb48f889..000000000 Binary files a/data/images/tiles/worldmap/castle8.png and /dev/null differ diff --git a/data/images/tiles/worldmap/castle9.png b/data/images/tiles/worldmap/castle9.png deleted file mode 100644 index 84bdbcefb..000000000 Binary files a/data/images/tiles/worldmap/castle9.png and /dev/null differ diff --git a/data/images/tiles/worldmap/firetux.png b/data/images/tiles/worldmap/firetux.png deleted file mode 100644 index 2629701d7..000000000 Binary files a/data/images/tiles/worldmap/firetux.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/brdg_l.png b/data/images/tiles/worldmap/forest/brdg_l.png deleted file mode 100644 index d85b316ce..000000000 Binary files a/data/images/tiles/worldmap/forest/brdg_l.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/brdg_lb.png b/data/images/tiles/worldmap/forest/brdg_lb.png deleted file mode 100644 index 0b54f091f..000000000 Binary files a/data/images/tiles/worldmap/forest/brdg_lb.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/brdg_lt.png b/data/images/tiles/worldmap/forest/brdg_lt.png deleted file mode 100644 index 8fbc12bac..000000000 Binary files a/data/images/tiles/worldmap/forest/brdg_lt.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/brdg_r.png b/data/images/tiles/worldmap/forest/brdg_r.png deleted file mode 100644 index 471eea9a6..000000000 Binary files a/data/images/tiles/worldmap/forest/brdg_r.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/brdg_rb.png b/data/images/tiles/worldmap/forest/brdg_rb.png deleted file mode 100644 index 87b7bd023..000000000 Binary files a/data/images/tiles/worldmap/forest/brdg_rb.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/ghost.png b/data/images/tiles/worldmap/forest/ghost.png deleted file mode 100644 index 001383745..000000000 Binary files a/data/images/tiles/worldmap/forest/ghost.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/ghost_wood.png b/data/images/tiles/worldmap/forest/ghost_wood.png deleted file mode 100644 index 85c9e5bcb..000000000 Binary files a/data/images/tiles/worldmap/forest/ghost_wood.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/ground.png b/data/images/tiles/worldmap/forest/ground.png deleted file mode 100644 index 92c5e883d..000000000 Binary files a/data/images/tiles/worldmap/forest/ground.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path.png b/data/images/tiles/worldmap/forest/path.png deleted file mode 100644 index 160bca3b3..000000000 Binary files a/data/images/tiles/worldmap/forest/path.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_es.png b/data/images/tiles/worldmap/forest/path_es.png deleted file mode 100644 index ee3e45255..000000000 Binary files a/data/images/tiles/worldmap/forest/path_es.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_ne.png b/data/images/tiles/worldmap/forest/path_ne.png deleted file mode 100644 index e1a7237ba..000000000 Binary files a/data/images/tiles/worldmap/forest/path_ne.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_nes.png b/data/images/tiles/worldmap/forest/path_nes.png deleted file mode 100644 index 64e420295..000000000 Binary files a/data/images/tiles/worldmap/forest/path_nes.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_v.png b/data/images/tiles/worldmap/forest/path_v.png deleted file mode 100644 index 0e8ce9ddc..000000000 Binary files a/data/images/tiles/worldmap/forest/path_v.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_wes.png b/data/images/tiles/worldmap/forest/path_wes.png deleted file mode 100644 index 4d1a6a237..000000000 Binary files a/data/images/tiles/worldmap/forest/path_wes.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_wn.png b/data/images/tiles/worldmap/forest/path_wn.png deleted file mode 100644 index ada0188f9..000000000 Binary files a/data/images/tiles/worldmap/forest/path_wn.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_wne.png b/data/images/tiles/worldmap/forest/path_wne.png deleted file mode 100644 index c5ace660f..000000000 Binary files a/data/images/tiles/worldmap/forest/path_wne.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_wns.png b/data/images/tiles/worldmap/forest/path_wns.png deleted file mode 100644 index 4986d8b70..000000000 Binary files a/data/images/tiles/worldmap/forest/path_wns.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/path_ws.png b/data/images/tiles/worldmap/forest/path_ws.png deleted file mode 100644 index a120443df..000000000 Binary files a/data/images/tiles/worldmap/forest/path_ws.png and /dev/null differ diff --git a/data/images/tiles/worldmap/forest/water.png b/data/images/tiles/worldmap/forest/water.png deleted file mode 100644 index 8d12e26ea..000000000 Binary files a/data/images/tiles/worldmap/forest/water.png and /dev/null differ diff --git a/data/images/tiles/worldmap/ground.png b/data/images/tiles/worldmap/ground.png deleted file mode 100644 index 6eaa400f4..000000000 Binary files a/data/images/tiles/worldmap/ground.png and /dev/null differ diff --git a/data/images/tiles/worldmap/igloo1.png b/data/images/tiles/worldmap/igloo1.png deleted file mode 100644 index 83b70d119..000000000 Binary files a/data/images/tiles/worldmap/igloo1.png and /dev/null differ diff --git a/data/images/tiles/worldmap/igloo2.png b/data/images/tiles/worldmap/igloo2.png deleted file mode 100644 index 12633dd5a..000000000 Binary files a/data/images/tiles/worldmap/igloo2.png and /dev/null differ diff --git a/data/images/tiles/worldmap/leveldot_green.png b/data/images/tiles/worldmap/leveldot_green.png deleted file mode 100644 index 6a881ba04..000000000 Binary files a/data/images/tiles/worldmap/leveldot_green.png and /dev/null differ diff --git a/data/images/tiles/worldmap/leveldot_red.png b/data/images/tiles/worldmap/leveldot_red.png deleted file mode 100644 index 27e95e25b..000000000 Binary files a/data/images/tiles/worldmap/leveldot_red.png and /dev/null differ diff --git a/data/images/tiles/worldmap/messagedot.png b/data/images/tiles/worldmap/messagedot.png deleted file mode 100644 index c450ae12e..000000000 Binary files a/data/images/tiles/worldmap/messagedot.png and /dev/null differ diff --git a/data/images/tiles/worldmap/placeholder.png b/data/images/tiles/worldmap/placeholder.png deleted file mode 100644 index 579e33e9f..000000000 Binary files a/data/images/tiles/worldmap/placeholder.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_e.png b/data/images/tiles/worldmap/road_e.png deleted file mode 100644 index 7be5c565c..000000000 Binary files a/data/images/tiles/worldmap/road_e.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_n.png b/data/images/tiles/worldmap/road_n.png deleted file mode 100644 index a5e30fd42..000000000 Binary files a/data/images/tiles/worldmap/road_n.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_ne.png b/data/images/tiles/worldmap/road_ne.png deleted file mode 100644 index e6b3a0ffa..000000000 Binary files a/data/images/tiles/worldmap/road_ne.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_nes.png b/data/images/tiles/worldmap/road_nes.png deleted file mode 100644 index 8a67e8eda..000000000 Binary files a/data/images/tiles/worldmap/road_nes.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_nesw.png b/data/images/tiles/worldmap/road_nesw.png deleted file mode 100644 index 224700fd2..000000000 Binary files a/data/images/tiles/worldmap/road_nesw.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_new.png b/data/images/tiles/worldmap/road_new.png deleted file mode 100644 index 5927660c2..000000000 Binary files a/data/images/tiles/worldmap/road_new.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_ns.png b/data/images/tiles/worldmap/road_ns.png deleted file mode 100644 index c452e11d6..000000000 Binary files a/data/images/tiles/worldmap/road_ns.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_nsw.png b/data/images/tiles/worldmap/road_nsw.png deleted file mode 100644 index 86373d44b..000000000 Binary files a/data/images/tiles/worldmap/road_nsw.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_nw.png b/data/images/tiles/worldmap/road_nw.png deleted file mode 100644 index 0fecb48bf..000000000 Binary files a/data/images/tiles/worldmap/road_nw.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_nws.png b/data/images/tiles/worldmap/road_nws.png deleted file mode 100644 index ff04ee0ed..000000000 Binary files a/data/images/tiles/worldmap/road_nws.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_s.png b/data/images/tiles/worldmap/road_s.png deleted file mode 100644 index 3e189813d..000000000 Binary files a/data/images/tiles/worldmap/road_s.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_se.png b/data/images/tiles/worldmap/road_se.png deleted file mode 100644 index 25d6354af..000000000 Binary files a/data/images/tiles/worldmap/road_se.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_sw.png b/data/images/tiles/worldmap/road_sw.png deleted file mode 100644 index c75bbe335..000000000 Binary files a/data/images/tiles/worldmap/road_sw.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_swe.png b/data/images/tiles/worldmap/road_swe.png deleted file mode 100644 index 371567f3a..000000000 Binary files a/data/images/tiles/worldmap/road_swe.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_w.png b/data/images/tiles/worldmap/road_w.png deleted file mode 100644 index 8b85775ec..000000000 Binary files a/data/images/tiles/worldmap/road_w.png and /dev/null differ diff --git a/data/images/tiles/worldmap/road_we.png b/data/images/tiles/worldmap/road_we.png deleted file mode 100644 index bef10e572..000000000 Binary files a/data/images/tiles/worldmap/road_we.png and /dev/null differ diff --git a/data/images/tiles/worldmap/smalltux.png b/data/images/tiles/worldmap/smalltux.png deleted file mode 100644 index 2fbcb021f..000000000 Binary files a/data/images/tiles/worldmap/smalltux.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow1.png b/data/images/tiles/worldmap/snow1.png deleted file mode 100644 index 331545ad5..000000000 Binary files a/data/images/tiles/worldmap/snow1.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow10.png b/data/images/tiles/worldmap/snow10.png deleted file mode 100644 index 874e47603..000000000 Binary files a/data/images/tiles/worldmap/snow10.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow11.png b/data/images/tiles/worldmap/snow11.png deleted file mode 100644 index de538b434..000000000 Binary files a/data/images/tiles/worldmap/snow11.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow12.png b/data/images/tiles/worldmap/snow12.png deleted file mode 100644 index fabca5993..000000000 Binary files a/data/images/tiles/worldmap/snow12.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow13.png b/data/images/tiles/worldmap/snow13.png deleted file mode 100644 index eb91a55a2..000000000 Binary files a/data/images/tiles/worldmap/snow13.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow2.png b/data/images/tiles/worldmap/snow2.png deleted file mode 100644 index 21d6bde04..000000000 Binary files a/data/images/tiles/worldmap/snow2.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow3.png b/data/images/tiles/worldmap/snow3.png deleted file mode 100644 index 431de6a89..000000000 Binary files a/data/images/tiles/worldmap/snow3.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow4.png b/data/images/tiles/worldmap/snow4.png deleted file mode 100644 index c285288fd..000000000 Binary files a/data/images/tiles/worldmap/snow4.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow5.png b/data/images/tiles/worldmap/snow5.png deleted file mode 100644 index 375812b1b..000000000 Binary files a/data/images/tiles/worldmap/snow5.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow6.png b/data/images/tiles/worldmap/snow6.png deleted file mode 100644 index 86ba96eac..000000000 Binary files a/data/images/tiles/worldmap/snow6.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow7.png b/data/images/tiles/worldmap/snow7.png deleted file mode 100644 index 9e6deacf7..000000000 Binary files a/data/images/tiles/worldmap/snow7.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow8.png b/data/images/tiles/worldmap/snow8.png deleted file mode 100644 index b76a2b7be..000000000 Binary files a/data/images/tiles/worldmap/snow8.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snow9.png b/data/images/tiles/worldmap/snow9.png deleted file mode 100644 index a94dd5d6b..000000000 Binary files a/data/images/tiles/worldmap/snow9.png and /dev/null differ diff --git a/data/images/tiles/worldmap/snowman.png b/data/images/tiles/worldmap/snowman.png deleted file mode 100644 index 478dfb8ab..000000000 Binary files a/data/images/tiles/worldmap/snowman.png and /dev/null differ diff --git a/data/images/tiles/worldmap/teleporterdot.png b/data/images/tiles/worldmap/teleporterdot.png deleted file mode 100644 index f1c86889c..000000000 Binary files a/data/images/tiles/worldmap/teleporterdot.png and /dev/null differ diff --git a/data/images/tiles/worldmap/tux.png b/data/images/tiles/worldmap/tux.png deleted file mode 100644 index ba6e52e77..000000000 Binary files a/data/images/tiles/worldmap/tux.png and /dev/null differ diff --git a/data/images/tiles/worldmap/water.png b/data/images/tiles/worldmap/water.png deleted file mode 100644 index 286b339da..000000000 Binary files a/data/images/tiles/worldmap/water.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood1.png b/data/images/tiles/worldmap/wood1.png deleted file mode 100644 index d71bdb9b3..000000000 Binary files a/data/images/tiles/worldmap/wood1.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood10.png b/data/images/tiles/worldmap/wood10.png deleted file mode 100644 index 01570d9ca..000000000 Binary files a/data/images/tiles/worldmap/wood10.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood11.png b/data/images/tiles/worldmap/wood11.png deleted file mode 100644 index 7e2845187..000000000 Binary files a/data/images/tiles/worldmap/wood11.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood12.png b/data/images/tiles/worldmap/wood12.png deleted file mode 100644 index 2de19cf7f..000000000 Binary files a/data/images/tiles/worldmap/wood12.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood13.png b/data/images/tiles/worldmap/wood13.png deleted file mode 100644 index 89023282d..000000000 Binary files a/data/images/tiles/worldmap/wood13.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood2.png b/data/images/tiles/worldmap/wood2.png deleted file mode 100644 index 8b048f50b..000000000 Binary files a/data/images/tiles/worldmap/wood2.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood3.png b/data/images/tiles/worldmap/wood3.png deleted file mode 100644 index 8076ae98a..000000000 Binary files a/data/images/tiles/worldmap/wood3.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood4.png b/data/images/tiles/worldmap/wood4.png deleted file mode 100644 index d35ef61c8..000000000 Binary files a/data/images/tiles/worldmap/wood4.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood5.png b/data/images/tiles/worldmap/wood5.png deleted file mode 100644 index 10c1e0e28..000000000 Binary files a/data/images/tiles/worldmap/wood5.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood6.png b/data/images/tiles/worldmap/wood6.png deleted file mode 100644 index cb0b2628e..000000000 Binary files a/data/images/tiles/worldmap/wood6.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood7.png b/data/images/tiles/worldmap/wood7.png deleted file mode 100644 index 7e9d812f0..000000000 Binary files a/data/images/tiles/worldmap/wood7.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood8.png b/data/images/tiles/worldmap/wood8.png deleted file mode 100644 index 386127487..000000000 Binary files a/data/images/tiles/worldmap/wood8.png and /dev/null differ diff --git a/data/images/tiles/worldmap/wood9.png b/data/images/tiles/worldmap/wood9.png deleted file mode 100644 index 9a838762d..000000000 Binary files a/data/images/tiles/worldmap/wood9.png and /dev/null differ diff --git a/data/images/worldmap.strf b/data/images/worldmap.strf index f53af89a4..230e44abc 100644 --- a/data/images/worldmap.strf +++ b/data/images/worldmap.strf @@ -4,7 +4,7 @@ ;; (supertux-tiles (tile (id 8) - (images "tiles/worldmap/ground.png") + (images "worldmap/antarctica/ground.png") (north #f) (south #f) (east #f) @@ -12,63 +12,63 @@ (stop #f)) (tile (id 9) - (images "tiles/worldmap/water.png")) + (images "worldmap/antarctica/water.png")) (tile (id 11) - (images "tiles/worldmap/snow1.png")) + (images "worldmap/antarctica/snow1.png")) (tile (id 12) - (images "tiles/worldmap/snow2.png")) + (images "worldmap/antarctica/snow2.png")) (tile (id 13) - (images "tiles/worldmap/snow3.png")) + (images "worldmap/antarctica/snow3.png")) (tile (id 14) - (images "tiles/worldmap/snow4.png")) + (images "worldmap/antarctica/snow4.png")) (tile (id 15) - (images "tiles/worldmap/snow5.png")) + (images "worldmap/antarctica/snow5.png")) (tile (id 16) - (images "tiles/worldmap/snow6.png")) + (images "worldmap/antarctica/snow6.png")) (tile (id 17) - (images "tiles/worldmap/snow7.png")) + (images "worldmap/antarctica/snow7.png")) (tile (id 18) - (images "tiles/worldmap/snow8.png")) + (images "worldmap/antarctica/snow8.png")) (tile (id 19) - (images "tiles/worldmap/snow9.png")) + (images "worldmap/antarctica/snow9.png")) (tile (id 20) - (images "tiles/worldmap/snow10.png")) + (images "worldmap/antarctica/snow10.png")) (tile (id 21) - (images "tiles/worldmap/snow11.png")) + (images "worldmap/antarctica/snow11.png")) (tile (id 22) - (images "tiles/worldmap/snow12.png")) + (images "worldmap/antarctica/snow12.png")) (tile (id 23) - (images "tiles/worldmap/snow13.png")) + (images "worldmap/antarctica/snow13.png")) (tile (id 24) - (images "tiles/worldmap/wood1.png")) + (images "worldmap/antarctica/wood1.png")) (tile (id 25) - (images "tiles/worldmap/wood2.png")) + (images "worldmap/antarctica/wood2.png")) (tile (id 26) - (images "tiles/worldmap/wood3.png")) + (images "worldmap/antarctica/wood3.png")) (tile (id 27) - (images "tiles/worldmap/wood4.png")) + (images "worldmap/antarctica/wood4.png")) (tile (id 28) - (images "tiles/worldmap/wood5.png")) + (images "worldmap/antarctica/wood5.png")) (tile (id 29) - (images "tiles/worldmap/wood6.png")) + (images "worldmap/antarctica/wood6.png")) (tile (id 30) - (images "tiles/worldmap/wood7.png")) + (images "worldmap/antarctica/wood7.png")) (tile (id 31) - (images "tiles/worldmap/wood8.png")) + (images "worldmap/antarctica/wood8.png")) (tile (id 32) - (images "tiles/worldmap/wood9.png")) + (images "worldmap/antarctica/wood9.png")) (tile (id 33) - (images "tiles/worldmap/wood10.png")) + (images "worldmap/antarctica/wood10.png")) (tile (id 34) - (images "tiles/worldmap/wood11.png")) + (images "worldmap/antarctica/wood11.png")) (tile (id 35) - (images "tiles/worldmap/wood12.png")) + (images "worldmap/antarctica/wood12.png")) (tile (id 36) - (images "tiles/worldmap/wood13.png")) + (images "worldmap/antarctica/wood13.png")) (tile (id 37) - (images "tiles/worldmap/road_ne.png") + (images "worldmap/antarctica/road_ne.png") (stop #f) (north #t) (south #f) @@ -76,77 +76,77 @@ (east #t)) (tile (id 38) - (images "tiles/worldmap/road_nsw.png") + (images "worldmap/antarctica/road_nsw.png") (north #t) (south #t) (west #t) (east #f) (stop #t)) (tile (id 39) - (images "tiles/worldmap/road_sw.png") + (images "worldmap/antarctica/road_sw.png") (stop #f) (north #f) (south #t) (west #t) (east #f)) (tile (id 40) - (images "tiles/worldmap/road_we.png") + (images "worldmap/antarctica/road_we.png") (north #f) (south #f) (west #t) (east #t) (stop #f)) (tile (id 41) - (images "tiles/worldmap/road_nes.png") + (images "worldmap/antarctica/road_nes.png") (north #t) (south #t) (west #f) (east #t) (stop #t)) (tile (id 42) - (images "tiles/worldmap/road_nw.png") + (images "worldmap/antarctica/road_nw.png") (stop #f) (north #t) (south #f) (west #t) (east #f)) (tile (id 43) - (images "tiles/worldmap/road_swe.png") + (images "worldmap/antarctica/road_swe.png") (north #f) (south #t) (west #t) (east #t) (stop #t)) (tile (id 44) - (images "tiles/worldmap/road_new.png") + (images "worldmap/antarctica/road_new.png") (north #t) (south #f) (west #t) (east #t) (stop #t)) (tile (id 45) - (images "tiles/worldmap/road_nesw.png") + (images "worldmap/antarctica/road_nesw.png") (north #t) (south #t) (west #t) (east #t) (stop #t)) (tile (id 46) - (images "tiles/worldmap/road_nws.png") + (images "worldmap/antarctica/road_nws.png") (north #t) (south #t) (west #t) (east #f) (stop #t)) (tile (id 47) - (images "tiles/worldmap/road_ns.png") + (images "worldmap/antarctica/road_ns.png") (north #t) (south #t) (west #f) (east #f) (stop #f)) (tile (id 48) - (images "tiles/worldmap/road_se.png") + (images "worldmap/antarctica/road_se.png") (stop #f) (north #f) (south #t) @@ -155,58 +155,58 @@ ;; castle (tile (id 49) - (images "tiles/worldmap/castle1.png") + (images "worldmap/antarctica/castle1.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 50) - (images "tiles/worldmap/castle2.png") + (images "worldmap/antarctica/castle2.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 51) - (images "tiles/worldmap/castle3.png") + (images "worldmap/antarctica/castle3.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 52) - (images "tiles/worldmap/castle4.png") + (images "worldmap/antarctica/castle4.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 53) - (images "tiles/worldmap/castle5.png") + (images "worldmap/antarctica/castle5.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 54) - (images "tiles/worldmap/castle6.png") + (images "worldmap/antarctica/castle6.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 55) - (images "tiles/worldmap/castle7.png") + (images "worldmap/antarctica/castle7.png") (north #f) (south #f) (west #f) (east #f)) (tile (id 56) - (images "tiles/worldmap/castle8.png") + (images "worldmap/antarctica/castle8.png") (stop #t) (north #f) (south #f) (west #f) (east #t)) (tile (id 57) - (images "tiles/worldmap/castle9.png") + (images "worldmap/antarctica/castle9.png") (stop #f) (north #f) (south #f) @@ -214,14 +214,14 @@ (east #t)) (tile (id 58) - (images "tiles/worldmap/igloo1.png") + (images "worldmap/antarctica/igloo1.png") (stop #f) (north #f) (south #f) (west #f) (east #f)) (tile (id 59) - (images "tiles/worldmap/igloo2.png") + (images "worldmap/antarctica/igloo2.png") (stop #t) (north #f) (south #t) @@ -229,7 +229,7 @@ (east #f)) (tile (id 60) - (images "tiles/worldmap/snowman.png") + (images "worldmap/antarctica/snowman.png") (north #f) (south #t) (west #f) @@ -237,14 +237,14 @@ ;; Secret paths (tile (id 61) - (images "tiles/worldmap/road_nws.png") + (images "worldmap/antarctica/road_nws.png") (north #t) (south #t) (west #t) (east #t)) (tile (id 62) - (images "tiles/worldmap/snow5.png") + (images "worldmap/antarctica/snow5.png") (stop #f) (north #f) (south #f) @@ -252,7 +252,7 @@ (east #t)) (tile (id 63) - (images "tiles/worldmap/water.png") + (images "worldmap/antarctica/water.png") (stop #f) (north #f) (south #f) @@ -260,7 +260,7 @@ (east #t)) (tile (id 64) - (images "tiles/worldmap/snow7.png") + (images "worldmap/antarctica/snow7.png") (stop #f) (north #f) (south #f) @@ -269,7 +269,7 @@ ;;one-way vertical road (tile (id 65) - (images "tiles/worldmap/road_ns.png") + (images "worldmap/antarctica/road_ns.png") (north #t) (south #t) (west #f) @@ -279,7 +279,7 @@ ;;one-way horizontal road (tile (id 66) - (images "tiles/worldmap/road_we.png") + (images "worldmap/antarctica/road_we.png") (north #f) (south #f) (west #t) @@ -289,7 +289,7 @@ ;; Another invisible road (tile (id 67) - (images "tiles/worldmap/snow9.png") + (images "worldmap/antarctica/snow9.png") (stop #t) (north #f) (south #f) @@ -298,7 +298,7 @@ ;; End of the line (tile (id 68) - (images "tiles/worldmap/road_n.png") + (images "worldmap/antarctica/road_n.png") (stop #t) (north #t) (south #f) @@ -306,7 +306,7 @@ (east #f)) (tile (id 69) - (images "tiles/worldmap/road_e.png") + (images "worldmap/antarctica/road_e.png") (stop #t) (north #f) (south #f) @@ -314,7 +314,7 @@ (east #t)) (tile (id 70) - (images "tiles/worldmap/road_s.png") + (images "worldmap/antarctica/road_s.png") (stop #t) (north #f) (south #t) @@ -322,7 +322,7 @@ (east #f)) (tile (id 71) - (images "tiles/worldmap/road_w.png") + (images "worldmap/antarctica/road_w.png") (stop #t) (north #f) (south #f) @@ -331,7 +331,7 @@ ;; Yet another invisible one (tile (id 72) - (images "tiles/worldmap/road_e.png") + (images "worldmap/antarctica/road_e.png") (stop #t) (north #f) (south #f) @@ -339,147 +339,147 @@ (east #t)) (tile (id 73) - (images "tiles/worldmap/forest/water.png") + (images "worldmap/forest/water.png") (stop #t) (north #f) (south #f) (west #t) (east #t)) (tile (id 74) - (images "tiles/worldmap/forest/ground.png") + (images "worldmap/forest/ground.png") (stop #t) (north #f) (south #f) (west #f) (east #f)) (tile (id 75) - (images "tiles/worldmap/forest/path.png") + (images "worldmap/forest/path.png") (stop #f) (north #f) (south #f) (west #t) (east #t)) (tile (id 76) - (images "tiles/worldmap/forest/ghost.png") + (images "worldmap/forest/ghost.png") (stop #t) (north #t) (south #t) (west #t) (east #t)) (tile (id 77) - (images "tiles/worldmap/forest/ghost_wood.png") + (images "worldmap/forest/ghost_wood.png") (stop #t) (north #f) (south #f) (west #f) (east #f)) (tile (id 78) - (images "tiles/worldmap/forest/path_v.png") + (images "worldmap/forest/path_v.png") (stop #f) (north #t) (south #t) (west #f) (east #f)) (tile (id 79) - (images "tiles/worldmap/forest/path_wns.png") + (images "worldmap/forest/path_wns.png") (stop #t) (north #t) (south #t) (west #t) (east #t)) (tile (id 80) - (images "tiles/worldmap/forest/path_nes.png") + (images "worldmap/forest/path_nes.png") (stop #t) (north #t) (south #t) (west #f) (east #t)) (tile (id 81) - (images "tiles/worldmap/forest/path_wn.png") + (images "worldmap/forest/path_wn.png") (stop #f) (north #t) (south #f) (west #t) (east #f)) (tile (id 82) - (images "tiles/worldmap/forest/path_ne.png") + (images "worldmap/forest/path_ne.png") (stop #f) (north #t) (south #f) (west #f) (east #t)) (tile (id 83) - (images "tiles/worldmap/forest/path_es.png") + (images "worldmap/forest/path_es.png") (stop #f) (north #f) (south #t) (west #f) (east #t)) (tile (id 84) - (images "tiles/worldmap/forest/path_wn.png") + (images "worldmap/forest/path_wn.png") (stop #f) (north #t) (south #f) (west #t) (east #f)) (tile (id 85) - (images "tiles/worldmap/forest/path_wns.png") + (images "worldmap/forest/path_wns.png") (stop #t) (north #t) (south #t) (west #t) (east #f)) (tile (id 86) - (images "tiles/worldmap/forest/path_wes.png") + (images "worldmap/forest/path_wes.png") (stop #t) (north #f) (south #t) (west #t) (east #t)) (tile (id 87) - (images "tiles/worldmap/forest/path_wne.png") + (images "worldmap/forest/path_wne.png") (stop #t) (north #t) (south #f) (west #t) (east #t)) (tile (id 88) - (images "tiles/worldmap/forest/path_ws.png") + (images "worldmap/forest/path_ws.png") (stop #f) (north #f) (south #t) (west #t) (east #f)) (tile (id 89) - (images "tiles/worldmap/forest/brdg_l.png") + (images "worldmap/forest/brdg_l.png") (stop #f) (north #f) (south #f) (west #t) (east #t)) (tile (id 90) - (images "tiles/worldmap/forest/brdg_r.png") + (images "worldmap/forest/brdg_r.png") (stop #f) (north #f) (south #f) (west #t) (east #t)) (tile (id 91) - (images "tiles/worldmap/forest/brdg_lt.png") + (images "worldmap/forest/brdg_lt.png") (stop #f) (north #f) (south #f) (west #f) (east #f)) (tile (id 92) - (images "tiles/worldmap/forest/brdg_rb.png") + (images "worldmap/forest/brdg_rb.png") (stop #f) (north #f) (south #f) (west #f) (east #f)) (tile (id 93) - (images "tiles/worldmap/forest/brdg_lb.png") + (images "worldmap/forest/brdg_lb.png") (stop #f) (north #f) (south #f) diff --git a/data/levels/test/kugelblitz.stl b/data/levels/test/kugelblitz.stl index 610a35b8e..ba74f7d60 100644 --- a/data/levels/test/kugelblitz.stl +++ b/data/levels/test/kugelblitz.stl @@ -95,6 +95,8 @@ (mode "normal") ) + (particles-rain) + (particles-ghosts) (spawnpoint (name "main") (x 950) (y 400)) (background (image "ghostforest.jpg") diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 36e04441b..c6f905345 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -352,10 +352,10 @@ WorldMap::WorldMap() tux = new Tux(this); add_object(tux); - leveldot_green= new Surface("images/tiles/worldmap/leveldot_green.png", true); - leveldot_red = new Surface("images/tiles/worldmap/leveldot_red.png", true); - messagedot = new Surface("images/tiles/worldmap/messagedot.png", true); - teleporterdot = new Surface("images/tiles/worldmap/teleporterdot.png", true); + leveldot_green= new Surface("images/worldmap/common/leveldot_green.png", true); + leveldot_red = new Surface("images/worldmap/common/leveldot_red.png", true); + messagedot = new Surface("images/worldmap/common/messagedot.png", true); + teleporterdot = new Surface("images/worldmap/common/teleporterdot.png", true); name = ""; music = "salcon.ogg";