- added tilemap loading for the worldmap

[supertux.git] / src / worldmap.cpp

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index d4a024c..b68b125 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -31,7 +31,7 @@ TileManager* TileManager::instance_  = 0;
 TileManager::TileManager()
 {
   lisp_stream_t stream;
-  FILE* in = fopen(DATA_PREFIX "tiles/antarctica.scm", "r");
+  FILE* in = fopen(DATA_PREFIX "images/worldmap/antarctica.scm", "r");
   assert(in);
   lisp_stream_init_file (&stream, in);
   lisp_object_t* root_obj = lisp_read (&stream);
@@ -44,7 +44,6 @@ TileManager::TileManager()
         {
           lisp_object_t* element = lisp_car(cur);
 
-          lisp_dump (element, stdout);
           if (strcmp(lisp_symbol(lisp_car(element)), "tile") == 0)
             {
               int id = 0;
@@ -102,17 +101,6 @@ WorldMap::WorldMap()
   width  = 20;
   height = 15;
   tux_moving = false;
-  tilemap.resize(width * height);
-  
-  tilemap[0] = 5;
-  tilemap[1] = 1;
-  tilemap[2] = 6;
-  tilemap[3] = 1;
-  tilemap[4] = 3;
-  tilemap[4+20] = 2;
-  tilemap[4+40] = 7;
-  tilemap[4+60] = 2;
-  tilemap[4+80] = 4;
 
   texture_load(&tux_sprite, DATA_PREFIX "/images/worldmap/tux.png", USE_ALPHA);
 
@@ -124,6 +112,8 @@ WorldMap::WorldMap()
   input_direction = NONE;
   tux_direction = NONE;
   enter_level = false;
+
+  load_map();
 }
 
 WorldMap::~WorldMap()
@@ -131,6 +121,40 @@ WorldMap::~WorldMap()
 }
 
 void
+WorldMap::load_map()
+{
+  lisp_stream_t stream;
+  FILE* in = fopen(DATA_PREFIX "levels/default/worldmap.scm", "r");
+  assert(in);
+  lisp_stream_init_file (&stream, in);
+  lisp_object_t* root_obj = lisp_read (&stream);
+  
+  if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0)
+    {
+      lisp_object_t* cur = lisp_cdr(root_obj);
+
+      while(!lisp_nil_p(cur))
+        {
+          lisp_object_t* element = lisp_car(cur);
+
+          if (strcmp(lisp_symbol(lisp_car(element)), "tilemap") == 0)
+            {
+              LispReader reader(lisp_cdr(element));
+              reader.read_int("width",  &width);
+              reader.read_int("height", &height);
+              reader.read_int_vector("data", &tilemap);
+            }
+          else
+            {
+              
+            }
+          
+          cur = lisp_cdr(cur);
+        }
+    }
+}
+
+void
 WorldMap::get_input()
 {
   SDL_Event event;