X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fworldmap.cpp;h=cd460ace84f8558d0254beddafeb6adffe0a02d9;hb=b6543ef22bd7e4193d03cadac0c6e0dc75e3bd66;hp=0e6bd3d76d6f014aeaa08d1e1b500e8a66af4fed;hpb=f9ecdc9dda2a40dbfecc555162ad165d10ff2640;p=supertux.git

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 0e6bd3d76..cd460ace8 100644
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include <fstream>
 #include <vector>
 #include <assert.h>
 #include "globals.h"
@@ -30,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()
@@ -161,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);
             }
         }
     }
@@ -180,12 +245,13 @@ Tux::update(float delta)
         { // We reached the next tile, so we check what to do now
           offset -= 32;
 
-          if (worldmap->at(tile_pos)->stop)
+          if (worldmap->at(tile_pos)->stop || worldmap->at_level())
             {
               stop();
             }
           else
             {
+              // Walk automatically to the next tile
               Point next_tile;
               if (worldmap->path_ok(direction, tile_pos, &next_tile))
                 {
@@ -205,7 +271,6 @@ WorldMap::WorldMap()
 {
   tux = new Tux(this);
 
-  quit = false;
   width  = 20;
   height = 15;
 
@@ -270,6 +335,13 @@ 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);
@@ -290,6 +362,16 @@ WorldMap::load_map()
 }
 
 void
+WorldMap::on_escape_press()
+{
+  // Show or hide the menu
+  if(!Menu::current())
+    Menu::set_current(worldmap_menu); 
+  else
+    Menu::set_current(0); 
+}
+
+void
 WorldMap::get_input()
 {
   enter_level = false;
@@ -298,24 +380,23 @@ WorldMap::get_input()
   SDL_Event event;
   while (SDL_PollEvent(&event))
     {
-      if(show_menu)
+      if (Menu::current())
         {
-          current_menu->event(event);
+          Menu::current()->event(event);
         }
       else
         {
           switch(event.type)
             {
             case SDL_QUIT:
-              quit = true;
+              st_abort("Received window close", "");
               break;
           
             case SDL_KEYDOWN:
               switch(event.key.keysym.sym)
                 {
                 case SDLK_ESCAPE:
-                  Menu::set_current(worldmap_menu);
-                  show_menu = !show_menu;
+                  on_escape_press();
                   break;
                 case SDLK_LCTRL:
                 case SDLK_RETURN:
@@ -347,6 +428,8 @@ WorldMap::get_input()
             case SDL_JOYBUTTONDOWN:
               if (event.jbutton.button == JOY_B)
                 enter_level = true;
+              else if (event.jbutton.button == JOY_START)
+                on_escape_press();
               break;
 
             default:
@@ -355,7 +438,7 @@ WorldMap::get_input()
         }
     }
 
-  if (!show_menu)
+  if (!Menu::current())
     {
       Uint8 *keystate = SDL_GetKeyState(NULL);
   
@@ -431,22 +514,52 @@ WorldMap::update()
 {
   if (enter_level && !tux->is_moving())
     {
-      for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+      Level* level = at_level();
+      if (level)
         {
-          if (i->x == tux->get_tile_pos().x && 
-              i->y == tux->get_tile_pos().y)
+          if (level->x == tux->get_tile_pos().x && 
+              level->y == tux->get_tile_pos().y)
             {
-              std::cout << "Enter the current level: " << i->name << std::endl;;
+              std::cout << "Enter the current level: " << level->name << std::endl;;
               halt_music();
-              GameSession session(datadir +  "levels/default/" + i->name,
+              
+              GameSession session(datadir +  "levels/" + level->name,
                                   1, ST_GL_LOAD_LEVEL_FILE);
-              session.run();
+
+              switch (session.run())
+                {
+                case GameSession::LEVEL_FINISHED:
+                  level->solved = true;
+                  break;
+                case GameSession::LEVEL_ABORT:
+                  // Reseting the player_status might be a worthy
+                  // consideration, but I don't think we need it
+                  // 'cause only the bad players will use it to
+                  // 'cheat' a few items and that isn't necesarry a
+                  // bad thing (ie. better they continue that way,
+                  // then stop playing the game all together since it
+                  // is to hard)
+                  break;
+                case GameSession::GAME_OVER:
+                  quit = true;
+                  break;
+                case GameSession::NONE:
+                  // Should never be reached 
+                  break;
+                }
+
               play_music(song, 1);
+              Menu::set_current(0);
+              if (!savegame_file.empty())
+                savegame(savegame_file);
               return;
             }
         }
-      std::cout << "Nothing to enter at: "
-                << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+      else
+        {
+          std::cout << "Nothing to enter at: "
+                    << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
+        }
     }
   else
     {
@@ -454,20 +567,31 @@ WorldMap::update()
       tux->update(0.33f);
     }
   
-  if(show_menu)
+  Menu* menu = Menu::current();
+  if(menu)
     {
-      if(current_menu == worldmap_menu)
+      menu->action();
+
+      if(menu == worldmap_menu)
         {
           switch (worldmap_menu->check())
             {
             case 2: // Return to game
-              menu_reset();
               break;
-            case 5: // Quit Worldmap
+            case 3:
+              if (!savegame_file.empty())
+                savegame(savegame_file);
+              break;
+                
+            case 6: // Quit Worldmap
               quit = true;
               break;
             }
         }
+      else if(menu == options_menu)
+        {
+          process_options_menu();
+        }
     }
 }
 
@@ -478,9 +602,24 @@ WorldMap::at(Point p)
          && p.x < width
          && p.y >= 0
          && p.y < height);
+
   return TileManager::instance()->get(tilemap[width * p.y + p.x]);
 }
 
+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 &*i; 
+    }
+
+  return 0;
+}
+
+
 void
 WorldMap::draw(const Point& offset)
 {
@@ -494,16 +633,62 @@ WorldMap::draw(const Point& offset)
   
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
-      leveldot_green->draw(i->x*32 + offset.x, 
-                           i->y*32 + offset.y);
+      if (i->solved)
+        leveldot_green->draw(i->x*32 + offset.x, 
+                             i->y*32 + offset.y);
+      else
+        leveldot_red->draw(i->x*32 + offset.x, 
+                           i->y*32 + offset.y);        
     }
 
   tux->draw(offset);
+  draw_status();
+}
+
+void
+WorldMap::draw_status()
+{
+  char str[80];
+  sprintf(str, "%d", player_status.score);
+  white_text->draw("SCORE", 0, 0);
+  gold_text->draw(str, 96, 0);
+
+  sprintf(str, "%d", player_status.distros);
+  white_text->draw_align("COINS", 320-64, 0,  A_LEFT, A_TOP);
+  gold_text->draw_align(str, 320+64, 0, A_RIGHT, A_TOP);
+
+  white_text->draw("LIVES", 480, 0);
+  if (player_status.lives >= 5)
+    {
+      sprintf(str, "%dx", player_status.lives);
+      gold_text->draw(str, 585, 0);
+      tux_life->draw(565+(18*3), 0);
+    }
+  else
+    {
+      for(int i= 0; i < player_status.lives; ++i)
+        tux_life->draw(565+(18*i),0);
+    }
+
+  if (!tux->is_moving())
+    {
+      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)
+            {
+              white_text->draw_align(i->name.c_str(), screen->w/2, screen->h,  A_HMIDDLE, A_BOTTOM);
+              break;
+            }
+        }
+    }
 }
 
 void
 WorldMap::display()
 {
+  Menu::set_current(0);
+
   quit = false;
 
   song = load_song(datadir +  "/music/" + music);
@@ -527,22 +712,127 @@ WorldMap::display()
     get_input();
     update();
 
-    menu_process_current();
+  if(Menu::current())
+    {
+      Menu::current()->draw();
+      mouse_cursor->draw();
+    }
     flipscreen();
 
     SDL_Delay(20);
   }
 
+  halt_music();
   free_music(song);
 }
 
-} // namespace WorldMapNS
+void
+WorldMap::savegame(const std::string& filename)
+{
+  std::cout << "savegame: " << filename << std::endl;
+  std::ofstream out(filename.c_str());
+
+  int nb_solved_levels = 0;
+  for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+    {
+      if (i->solved)
+        ++nb_solved_levels;
+    }
 
-void worldmap_run()
+  out << "(supertux-savegame\n"
+      << "  (version 1)\n"
+      << "  (title  \"Icyisland - " << nb_solved_levels << "/" << levels.size() << "\")\n"
+      << "  (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 << ")"
+      << " (back \"" << direction_to_string(tux->back_direction) << "\"))\n"
+      << "  (levels\n";
+  
+  for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+    {
+      if (i->solved)
+        {
+          out << "     (level (name \"" << i->name << "\")\n"
+              << "            (solved #t))\n";
+        }
+    }  
+
+  out << "   )\n"
+      << " )\n\n;; EOF ;;" << std::endl;
+}
+
+void
+WorldMap::loadgame(const std::string& filename)
 {
-  WorldMapNS::WorldMap worldmap;
+  std::cout << "loadgame: " << filename << std::endl;
+  savegame_file = filename;
+
+  if (access(filename.c_str(), F_OK) == 0)
+    {
+      lisp_object_t* cur = lisp_read_from_file(filename);
+
+      if (strcmp(lisp_symbol(lisp_car(cur)), "supertux-savegame") != 0)
+        return;
+
+      cur = lisp_cdr(cur);
+      LispReader reader(cur);
   
-  worldmap.display();
+      reader.read_int("lives",  &player_status.lives);
+      reader.read_int("score",  &player_status.score);
+      reader.read_int("distros", &player_status.distros);
+
+      if (player_status.lives < 0)
+        player_status.lives = 3;
+
+      lisp_object_t* tux_cur = 0;
+      if (reader.read_lisp("tux", &tux_cur))
+        {
+          Point p;
+          std::string back_str = "none";
+
+          LispReader tux_reader(tux_cur);
+          tux_reader.read_int("x", &p.x);
+          tux_reader.read_int("y", &p.y);
+          tux_reader.read_string("back", &back_str);
+          
+          tux->back_direction = string_to_direction(back_str);      
+          tux->set_tile_pos(p);
+        }
+
+      lisp_object_t* level_cur = 0;
+      if (reader.read_lisp("levels", &level_cur))
+        {
+          while(level_cur)
+            {
+              lisp_object_t* sym  = lisp_car(lisp_car(level_cur));
+              lisp_object_t* data = lisp_cdr(lisp_car(level_cur));
+
+              if (strcmp(lisp_symbol(sym), "level") == 0)
+                {
+                  std::string name;
+                  bool solved = false;
+
+                  LispReader level_reader(data);
+                  level_reader.read_string("name",   &name);
+                  level_reader.read_bool("solved", &solved);
+
+                  for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
+                    {
+                      if (name == i->name)
+                        i->solved = solved;
+                    }
+                }
+
+              level_cur = lisp_cdr(level_cur);
+            }
+        }
+    }
 }
 
-/* EOF */
+} // namespace WorldMapNS
+
+/* Local Variables: */
+/* mode:c++ */
+/* End: */
+