From: Ingo Ruhnke Date: Sun, 11 Apr 2004 01:52:49 +0000 (+0000) Subject: - fixed worldmap a bit X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e8d3200207b0ae929d46ae5f3083cad0366198c2;p=supertux.git - fixed worldmap a bit SVN-Revision: 467 --- diff --git a/data/levels/default/snow1-grumbel.stl b/data/levels/default/snow1-grumbel.stl index 039faeac3..06f688b58 100644 --- a/data/levels/default/snow1-grumbel.stl +++ b/data/levels/default/snow1-grumbel.stl @@ -1,4 +1,4 @@ -;; Generated by Windstille Editor +;; Generated by Flexlay Editor (supertux-level (version 1) (name "Hello World") @@ -68,63 +68,64 @@ ) (objects - (mriceblock (x 1138) (y 405)) - (mrbomb (x 1024) (y 400)) - (mriceblock (x 1714) (y 352)) - (mriceblock (x 2021) (y 416)) - (mriceblock (x 2770) (y 252)) - (mriceblock (x 2720) (y 251)) - (mriceblock (x 2665) (y 252)) - (mriceblock (x 3450) (y 313)) - (mriceblock (x 3525) (y 311)) - (mriceblock (x 3934) (y 250)) - (mriceblock (x 4007) (y 249)) - (mriceblock (x 4556) (y 406)) - (mriceblock (x 4627) (y 406)) - (mriceblock (x 4489) (y 408)) - (money (x 2089) (y 294)) + (laptop (x 1148) (y 351)) + (mrbomb (x 1008) (y 346)) + (laptop (x 1678) (y 293)) + (laptop (x 1976) (y 335)) + (laptop (x 2770) (y 252)) + (laptop (x 2720) (y 251)) + (laptop (x 2665) (y 252)) + (laptop (x 3450) (y 313)) + (laptop (x 3525) (y 311)) + (laptop (x 3934) (y 250)) + (laptop (x 4007) (y 249)) + (laptop (x 4556) (y 406)) + (laptop (x 4627) (y 406)) + (laptop (x 4489) (y 408)) + (money (x 2112) (y 296)) (money (x 4320) (y 264)) (money (x 4739) (y 264)) - (mriceblock (x 5327) (y 207)) - (mriceblock (x 5380) (y 207)) - (mriceblock (x 5277) (y 207)) - (mriceblock (x 5908) (y 159)) - (mriceblock (x 5978) (y 158)) + (laptop (x 5327) (y 207)) + (laptop (x 5380) (y 207)) + (laptop (x 5277) (y 207)) + (laptop (x 5908) (y 159)) + (laptop (x 5978) (y 158)) (mrbomb (x 5759) (y 407)) - (mriceblock (x 5878) (y 408)) - (mriceblock (x 5963) (y 405)) + (laptop (x 5878) (y 408)) + (laptop (x 5963) (y 405)) (money (x 7356) (y 303)) (money (x 7228) (y 371)) (money (x 7098) (y 351)) - (mriceblock (x 7943) (y 403)) - (mriceblock (x 8014) (y 402)) - (mriceblock (x 8089) (y 397)) + (laptop (x 7943) (y 403)) + (laptop (x 8014) (y 402)) + (laptop (x 8089) (y 397)) (money (x 8800) (y 317)) - (mriceblock (x 9422) (y 339)) - (mriceblock (x 9595) (y 217)) - (mriceblock (x 9665) (y 216)) + (laptop (x 9422) (y 339)) + (laptop (x 9595) (y 217)) + (laptop (x 9665) (y 216)) (money (x 9979) (y 434)) (money (x 10225) (y 432)) - (mriceblock (x 10113) (y 159)) - (mriceblock (x 11129) (y 372)) - (mriceblock (x 11181) (y 370)) - (mriceblock (x 11236) (y 372)) + (laptop (x 10113) (y 159)) + (laptop (x 11129) (y 372)) + (laptop (x 11181) (y 370)) + (laptop (x 11236) (y 372)) (money (x 10798) (y 403)) - (mriceblock (x 11783) (y 215)) - (mriceblock (x 11833) (y 215)) - (mriceblock (x 11883) (y 216)) - (mriceblock (x 12734) (y 246)) - (mriceblock (x 12796) (y 246)) - (mriceblock (x 12676) (y 247)) + (laptop (x 11783) (y 215)) + (laptop (x 11833) (y 215)) + (laptop (x 11883) (y 216)) + (laptop (x 12734) (y 246)) + (laptop (x 12796) (y 246)) + (laptop (x 12676) (y 247)) (money (x 13231) (y 312)) - (mriceblock (x 13726) (y 216)) - (mriceblock (x 13792) (y 216)) + (laptop (x 13726) (y 216)) + (laptop (x 13792) (y 216)) (money (x 14221) (y 229)) (money (x 14033) (y 228)) - (mriceblock (x 14664) (y 213)) - (mriceblock (x 14732) (y 212)) + (laptop (x 14664) (y 213)) + (laptop (x 14732) (y 212)) (money (x 14990) (y 253)) (money (x 15090) (y 253)) + (money (x 816) (y 270)) ) ) diff --git a/data/levels/default/worldmap.stwm b/data/levels/default/worldmap.stwm index ddc5afe76..3cb568773 100644 --- a/data/levels/default/worldmap.stwm +++ b/data/levels/default/worldmap.stwm @@ -1,39 +1,42 @@ +;; Generated with Windstille Editor (supertux-worldmap - (tilemap (width 20) - (height 15) - (data 5 1 1 6 1 4 1 1 6 1 1 4 1 1 3 8 8 8 8 8 - 8 8 8 8 8 2 8 8 8 8 8 2 8 8 2 8 8 8 8 8 - 8 8 8 8 8 2 8 8 8 8 8 7 8 8 2 8 8 8 8 8 - 8 8 8 8 8 7 8 8 8 8 8 7 8 8 2 8 8 8 8 8 - 8 8 8 8 8 2 8 8 8 8 8 2 8 8 2 8 8 8 8 8 - 8 8 8 8 8 2 8 4 1 6 1 4 1 1 4 1 1 1 4 8 - 8 8 8 8 8 7 8 2 8 8 8 8 8 8 2 8 8 8 8 8 - 8 8 8 8 8 2 8 2 8 8 8 8 8 8 2 8 8 8 8 8 - 8 8 8 8 8 4 1 4 6 1 1 6 1 1 4 8 8 8 8 8 - 8 8 8 8 8 7 8 8 8 8 8 8 8 8 7 8 8 8 8 8 - 8 8 8 8 8 2 8 8 8 8 8 8 8 8 2 8 8 8 8 8 - 8 8 8 8 8 2 8 8 8 8 8 8 8 8 2 8 8 8 8 8 - 8 8 8 8 8 4 1 1 6 1 1 6 1 1 4 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 8 8 8 8 8 8 8 8 - )) - (levels + (tilemap + (width 20) + (height 15) + (data + 9 9 9 9 9 11 16 12 11 16 16 16 16 12 9 9 9 9 9 9 + 9 9 11 16 16 22 19 17 15 48 40 40 39 23 16 12 9 9 9 9 + 9 9 15 20 18 18 18 13 15 47 19 19 37 40 39 23 16 12 9 9 + 9 11 22 17 11 16 16 16 22 47 48 40 40 40 44 39 19 23 16 12 + 9 15 19 23 22 48 40 40 40 44 46 48 39 19 19 47 19 19 19 17 + 9 15 48 39 19 41 40 40 40 40 42 47 47 19 19 47 19 20 18 13 + 9 15 37 45 40 45 40 40 40 40 43 42 37 40 40 42 19 17 9 9 + 9 15 19 47 19 47 19 19 48 40 42 19 24 25 25 25 26 17 9 9 + 9 14 21 37 40 46 19 48 42 19 24 25 33 32 35 29 28 17 9 9 + 9 9 15 19 19 37 40 42 24 25 33 35 29 29 28 20 18 13 9 9 + 9 9 15 19 19 24 25 25 33 32 35 28 20 18 18 13 9 9 9 9 + 9 9 14 21 19 31 32 32 32 35 28 20 13 9 9 11 16 12 9 9 + 9 9 9 14 21 30 29 29 29 28 20 13 9 11 16 22 20 13 9 9 + 9 9 9 9 14 18 18 18 18 18 13 9 9 14 18 18 13 9 9 9 + 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 + )) + (levels (level (name "level1.stl") (x 3) (y 0)) (level (name "level2.stl") (x 5) (y 3)) (level (name "level3.stl") (x 8) (y 0)) (level (name "level4.stl") (x 7) (y 5)) - (level (name "snow1.stl") (x 0) (y 0)) - (level (name "snow2.stl") (x 5) (y 0)) - (level (name "cave1.stl") (x 5) (y 6)) - (level (name "cave2.stl") (x 5) (y 8)) - (level (name "snow3.stl") (x 5) (y 12)) - (level (name "cave3.stl") (x 8) (y 12)) - (level (name "cave4.stl") (x 11) (y 12)) - (level (name "snow4.stl") (x 14) (y 12)) - (level (name "cave5.stl") (x 14) (y 9)) - (level (name "snow5.stl") (x 14) (y 5)) - (level (name "cave6.stl") (x 11) (y 0)) - (level (name "snow6.stl") (x 14) (y 9)) - )) + (level (name "snow1-grumbel.stl") (x 0) (y 0)) + (level (name "snow2-grumbel.stl") (x 5) (y 0)) + (level (name "cave1-grumbel.stl") (x 5) (y 6)) + (level (name "cave2-grumbel.stl") (x 5) (y 8)) + (level (name "snow3-grumbel.stl") (x 5) (y 12)) + (level (name "cave3-grumbel.stl") (x 8) (y 12)) + (level (name "cave4-grumbel.stl") (x 11) (y 12)) + (level (name "snow4-grumbel.stl") (x 14) (y 12)) + (level (name "cave5-grumbel.stl") (x 14) (y 9)) + (level (name "snow5-grumbel.stl") (x 14) (y 5)) + (level (name "cave6-grumbel.stl") (x 11) (y 0)) + (level (name "snow6-grumbel.stl") (x 14) (y 9))) + + ) -;; EOF ;; \ No newline at end of file diff --git a/data/levels/test/enemytest.stl b/data/levels/test/enemytest.stl index 7c74692e4..1dcde2c6e 100644 --- a/data/levels/test/enemytest.stl +++ b/data/levels/test/enemytest.stl @@ -68,7 +68,7 @@ ) (objects - (fish (x 509) (y 281)) + (fish (x 509) (y 181)) (flyingsnowball (x 941) (y 222)) (spiky (x 656) (y 306)) (snowball (x 259) (y 303)) diff --git a/src/worldmap.cpp b/src/worldmap.cpp index 19db528a6..b0f5eef7e 100644 --- a/src/worldmap.cpp +++ b/src/worldmap.cpp @@ -201,6 +201,8 @@ WorldMap::WorldMap() height = 15; texture_load(&level_sprite, datadir + "/images/worldmap/levelmarker.png", USE_ALPHA); + texture_load(&leveldot_green, datadir + "/images/worldmap/leveldot_green.png", USE_ALPHA); + texture_load(&leveldot_red, datadir + "/images/worldmap/leveldot_red.png", USE_ALPHA); input_direction = NONE; enter_level = false; @@ -456,7 +458,7 @@ WorldMap::draw() for(Levels::iterator i = levels.begin(); i != levels.end(); ++i) { - texture_draw(&level_sprite, i->x*32, i->y*32); + texture_draw(&leveldot_green, i->x*32, i->y*32); } tux->draw(); diff --git a/src/worldmap.h b/src/worldmap.h index 634a608a4..71e9d2654 100644 --- a/src/worldmap.h +++ b/src/worldmap.h @@ -114,6 +114,9 @@ private: Tux* tux; texture_type level_sprite; + texture_type leveldot_green; + texture_type leveldot_red; + bool quit; std::string name;