- implemented locked levels on worldmap

SVN-Revision: 548

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 7ee5449..f96b104 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -31,6 +31,57 @@
 
 namespace WorldMapNS {
 
+Direction reverse_dir(Direction direction)
+{
+  switch(direction)
+    {
+    case WEST:
+      return EAST;
+    case EAST:
+      return WEST;
+    case NORTH:
+      return SOUTH;
+    case SOUTH:
+      return NORTH;
+    case NONE:
+      return NONE;
+    }
+  return NONE;
+}
+
+std::string
+direction_to_string(Direction direction)
+{
+  switch(direction)
+    {
+    case WEST:
+      return "west";
+    case EAST:
+      return "east";
+    case NORTH:
+      return "north";
+    case SOUTH:
+      return "south";
+    default:
+      return "none";
+    }
+}
+
+Direction
+string_to_direction(const std::string& directory)
+{
+  if (directory == "west")
+    return WEST;
+  else if (directory == "east")
+    return EAST;
+  else if (directory == "north")
+    return NORTH;
+  else if (directory == "south")
+    return SOUTH;
+  else
+    return NONE;
+}
+
 TileManager* TileManager::instance_  = 0;
 
 TileManager::TileManager()
@@ -162,13 +213,26 @@ Tux::update(float delta)
   if (!moving)
     {
       if (input_direction != NONE)
-        { // We got a new direction, so lets start walking when possible
+        { 
+          WorldMap::Level* level = worldmap->at_level();
+
+          // We got a new direction, so lets start walking when possible
           Point next_tile;
-          if (worldmap->path_ok(input_direction, tile_pos, &next_tile))
+          if ((!level || level->solved)
+              && worldmap->path_ok(input_direction, tile_pos, &next_tile))
             {
               tile_pos = next_tile;
               moving = true;
               direction = input_direction;
+              back_direction = reverse_dir(direction);
+            }
+          else if (input_direction == back_direction)
+            {
+              std::cout << "Back triggered" << std::endl;
+              moving = true;
+              direction = input_direction;
+              tile_pos = worldmap->get_next_tile(tile_pos, direction);
+              back_direction = reverse_dir(direction);
             }
         }
     }
@@ -187,6 +251,7 @@ Tux::update(float delta)
             }
           else
             {
+              // Walk automatically to the next tile
               Point next_tile;
               if (worldmap->path_ok(direction, tile_pos, &next_tile))
                 {
@@ -271,6 +336,12 @@ WorldMap::load_map()
                       Level level;
                       LispReader reader(lisp_cdr(element));
                       level.solved = false;
+                      
+                      level.north = true;
+                      level.east  = true;
+                      level.south = true;
+                      level.west  = true;
+
                       reader.read_string("name",  &level.name);
                       reader.read_int("x", &level.x);
                       reader.read_int("y", &level.y);
@@ -487,20 +558,21 @@ WorldMap::at(Point p)
          && p.x < width
          && p.y >= 0
          && p.y < height);
+
   return TileManager::instance()->get(tilemap[width * p.y + p.x]);
 }
 
-bool
+WorldMap::Level*
 WorldMap::at_level()
 {
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
       if (i->x == tux->get_tile_pos().x && 
           i->y == tux->get_tile_pos().y)
-           return true; 
+        return &*i; 
     }
 
-  return false;
+  return 0;
 }
 
 
@@ -625,7 +697,8 @@ WorldMap::savegame(const std::string& filename)
       << "  (lives   " << player_status.lives << ")\n"
       << "  (score   " << player_status.score << ")\n"
       << "  (distros " << player_status.distros << ")\n"
-      << "  (tux     (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << "))\n"
+      << "  (tux     (x " << tux->get_tile_pos().x << ") (y " << tux->get_tile_pos().y << ")"
+      << " (back \"" << direction_to_string(tux->back_direction) << "\"))\n"
       << "  (levels\n";
   
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
@@ -684,10 +757,14 @@ WorldMap::loadgame(const std::string& filename)
                 {
                   std::string name;
                   bool solved = false;
-              
+                  std::string back_str ="";
+                  Direction back = NONE;
+
                   LispReader level_reader(data);
                   level_reader.read_string("name",   &name);
                   level_reader.read_bool("solved", &solved);
+                  if (level_reader.read_string("back", &back_str))
+                    back = string_to_direction(back_str);
 
                   std::cout << "Name: " << name << " " << solved << std::endl;
 

diff --git a/src/worldmap.h b/src/worldmap.h
index 2e67f2d..343ef61 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -77,10 +77,16 @@ public:
 
 enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
 
+std::string direction_to_string(Direction d);
+Direction   string_to_direction(const std::string& d);
+Direction reverse_dir(Direction d);
+
 class WorldMap;
 
 class Tux
 {
+public:
+  Direction back_direction;
 private:
   WorldMap* worldmap;
   Surface* sprite;
@@ -127,14 +133,22 @@ private:
   int width;
   int height;
 
+public:
   struct Level
   {
     int x;
     int y;
     std::string name;
     bool solved;
+
+    // Directions which are walkable from this level
+    bool north;
+    bool east;
+    bool south;
+    bool west;
   };
 
+private:
   typedef std::vector<Level> Levels;
   Levels levels;
 
@@ -166,7 +180,7 @@ public:
 
   Point get_next_tile(Point pos, Direction direction);
   Tile* at(Point pos);
-  bool at_level();
+  WorldMap::Level* at_level();
 
   /** Check if it is possible to walk from \a pos into \a direction,
       if possible, write the new position to \a new_pos */