X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=6badcd5a3453326c9f69d9c18c01424e3ea9dc95;hb=eba5f4b45f92cb19a09fbac1a478648062480adb;hp=83151af3e6f609fe30f34995f72333df604a2dea;hpb=7fa266cd1d7062e3451a7dda0ccf42571faac78c;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 83151af3e..6badcd5a3 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -18,13 +18,17 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 //  02111-1307, USA.
+#include <config.h>
 
 #include <iostream>
+#include <sstream>
+#include <stdexcept>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <unistd.h>
+#include <cmath>
 #include <SDL.h>
 #include <SDL_image.h>
 
@@ -33,101 +37,189 @@
 #include <ctype.h>
 #endif
 
-#include "defines.h"
-#include "globals.h"
+#include "app/globals.h"
 #include "title.h"
-#include "screen.h"
-#include "high_scores.h"
-#include "menu.h"
-#include "texture.h"
+#include "video/screen.h"
+#include "video/surface.h"
+#include "gui/menu.h"
 #include "timer.h"
-#include "setup.h"
+#include "special/frame_rate.h"
+#include "app/setup.h"
+#include "lisp/lisp.h"
+#include "lisp/parser.h"
 #include "level.h"
-#include "gameloop.h"
+#include "level_subset.h"
+#include "game_session.h"
+#include "worldmap.h"
 #include "leveleditor.h"
-#include "scene.h"
-#include "player.h"
-#include "math.h"
+#include "player_status.h"
 #include "tile.h"
+#include "sector.h"
+#include "object/tilemap.h"
+#include "object/camera.h"
+#include "object/player.h"
 #include "resources.h"
+#include "app/gettext.h"
+#include "misc.h"
+#include "textscroller.h"
+#include "control/joystickkeyboardcontroller.h"
+#include "control/codecontroller.h"
+#include "main.h"
 
 static Surface* bkg_title;
 static Surface* logo;
 static Surface* img_choose_subset;
 
 static bool walking;
-static Timer random_timer;
+static Timer2 random_timer;
 
 static int frame;
-static unsigned int last_update_time;
-static unsigned int update_time;
 
-void display_credits();
+static GameSession* titlesession;
+static CodeController* controller;
 
-std::vector<st_subset> contrib_subsets;
-std::string current_contrib_subset;
+static std::vector<LevelSubset*> contrib_subsets;
+static LevelSubset* current_contrib_subset = 0;
 
-void generate_contrib_menu()
+static FrameRate frame_rate(100);
+
+/* If the demo was stopped - because game started, level
+   editor was excuted, etc - call this when you get back
+   to the title code.
+ */
+void resume_demo()
+{
+  player_status.reset();
+  titlesession->get_current_sector()->activate("main");
+  titlesession->set_current();
+
+  frame_rate.update();
+}
+
+void update_load_save_game_menu(Menu* menu)
 {
-  string_list_type level_subsets = dsubdirs("/levels", "info");
+  printf("update loadsavemenu.\n");
+  for(int i = 1; i < 6; ++i) {
+    MenuItem& item = menu->get_item_by_id(i);
+    item.kind = MN_ACTION;
+    item.change_text(slotinfo(i));
+  }
+}
 
+void free_contrib_menu()
+{
+  for(std::vector<LevelSubset*>::iterator i = contrib_subsets.begin();
+      i != contrib_subsets.end(); ++i)
+    delete *i;
+
+  contrib_subsets.clear();
   contrib_menu->clear();
-  contrib_menu->additem(MN_LABEL,"Contrib Levels",0,0);
-  contrib_menu->additem(MN_HL,"",0,0);
+}
 
-  for (int i = 0; i < level_subsets.num_items; ++i)
+void generate_contrib_menu()
+{
+  /** Generating contrib levels list by making use of Level Subset  */
+  std::set<std::string> level_subsets = FileSystem::dsubdirs("/levels", "info");
+
+  free_contrib_menu();
+
+  contrib_menu->add_label(_("Contrib Levels"));
+  contrib_menu->add_hl();
+  
+  int i = 0;
+  for (std::set<std::string>::iterator it = level_subsets.begin();
+      it != level_subsets.end(); ++it)
     {
-      st_subset subset;
-      subset.load(level_subsets.item[i]);
-      contrib_menu->additem(MN_GOTO, subset.title.c_str(), i, contrib_subset_menu);
+      LevelSubset* subset = new LevelSubset();
+      subset->load(*it);
+      if(subset->hide_from_contribs) {
+        delete subset;
+        continue;
+      }
+      contrib_menu->add_submenu(subset->title, contrib_subset_menu);
       contrib_subsets.push_back(subset);
+      ++i;
     }
 
-  contrib_menu->additem(MN_HL,"",0,0);
-  contrib_menu->additem(MN_BACK,"Back",0,0);
+  contrib_menu->add_hl();
+  contrib_menu->add_back(_("Back"));
+  
+  level_subsets.clear();
+}
 
-  string_list_free(&level_subsets);
+std::string get_level_name(const std::string& filename)
+{
+  try {
+    lisp::Parser parser;
+    std::auto_ptr<lisp::Lisp> root (parser.parse(filename));
+
+    const lisp::Lisp* level = root->get_lisp("supertux-level");
+    if(!level)
+      return "";
+
+    std::string name;
+    level->get("name", name);
+    return name;
+  } catch(std::exception& e) {
+    std::cerr << "Problem getting name of '" << filename << "'.\n";
+    return "";
+  }
 }
 
-void check_contrib_menu()
+void check_levels_contrib_menu()
 {
   static int current_subset = -1;
 
   int index = contrib_menu->check();
-  if (index != -1)
-    {
-      index -= 2; // FIXME: Hack
-      if (index >= 0 && index <= int(contrib_subsets.size()))
-        {
-          if (current_subset != index)
-            {
-              current_subset = index;
-              // FIXME: This shouln't be busy looping
-              st_subset& subset = contrib_subsets[index];
-          
-              current_contrib_subset = subset.name;
+  if (index == -1)
+    return;
 
-              std::cout << "Updating the contrib subset menu..." << subset.levels << std::endl;
-      
-              contrib_subset_menu->clear();
+  LevelSubset& subset = * (contrib_subsets[index]);
+  
+  if(subset.has_worldmap) {
+    WorldMapNS::WorldMap worldmap;
+    worldmap.set_map_filename(subset.get_worldmap_filename());
 
-              contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0);
-              contrib_subset_menu->additem(MN_HL,"",0,0);
-              for (int i = 1; i <= subset.levels; ++i)
-                {
-                  Level level;
-                  level.load(subset.name, i);
-                  contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0);
-                }
-              contrib_subset_menu->additem(MN_HL,"",0,0);      
-              contrib_subset_menu->additem(MN_BACK, "Back", 0, 0);
-            }
-        }
-      else
-        {
-          // Back button
-        }
+    // some fading
+    fadeout(256);
+    DrawingContext context;
+    context.draw_text(white_text, "Loading...",
+        Vector(SCREEN_WIDTH/2, SCREEN_HEIGHT/2), CENTER_ALLIGN, LAYER_FOREGROUND1);
+    context.do_drawing();
+
+    // TODO: slots should be available for contrib maps
+    worldmap.loadgame(user_dir + "/save/" + subset.name + "-slot1.stsg");
+
+    worldmap.display();  // run the map
+
+    Menu::set_current(main_menu);
+    resume_demo();
+  } else if (current_subset != index) {
+    current_subset = index;
+    // FIXME: This shouln't be busy looping
+    LevelSubset& subset = * (contrib_subsets[index]);
+
+    current_contrib_subset = &subset;
+
+    contrib_subset_menu->clear();
+
+    contrib_subset_menu->add_label(subset.title);
+    contrib_subset_menu->add_hl();
+
+    for (int i = 0; i < subset.get_num_levels(); ++i)
+    {
+      /** get level's title */
+      std::string filename = subset.get_level_filename(i);
+      std::string title = get_level_name(filename);
+      contrib_subset_menu->add_entry(i, title);
     }
+
+    contrib_subset_menu->add_hl();
+    contrib_subset_menu->add_back(_("Back"));
+
+    titlesession->get_current_sector()->activate("main");
+    titlesession->set_current();
+  }
 }
 
 void check_contrib_subset_menu()
@@ -135,188 +227,168 @@ void check_contrib_subset_menu()
   int index = contrib_subset_menu->check();
   if (index != -1)
     {
-      if (contrib_subset_menu->get_item(index).kind == MN_ACTION)
+      if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION)
         {
-          index -= 1; // FIXME: Hack
-          std::cout << "Sarting level: " << index << std::endl;
-          halt_music();
-          GameSession session(current_contrib_subset, index, ST_GL_PLAY);
+          std::cout << "Starting level: " << index << std::endl;
+          
+          GameSession session(
+              current_contrib_subset->get_level_filename(index), ST_GL_PLAY);
           session.run();
+          player_status.reset();
           Menu::set_current(main_menu);
+          resume_demo();
         }
     }  
 }
 
-void draw_background()
+void draw_demo(float elapsed_time)
 {
-  /* Draw the title background: */
+  static float last_tux_x_pos = -1;
+  Sector* sector  = titlesession->get_current_sector();
+  Player* tux = sector->player;
 
-  bkg_title->draw_bg();
-}
+  sector->play_music(LEVEL_MUSIC);
 
-void draw_demo(GameSession* session, double frame_ratio)
-{
-  World::set_current(session->get_world());
-  //World* world  = session->get_world();
-  Level* plevel = session->get_level();
-  Player* tux = session->get_world()->get_tux();
-
-  session->get_world()->play_music(LEVEL_MUSIC);
+  controller->update();
+  controller->press(Controller::RIGHT);
   
-  /* FIXME:
-  // update particle systems
-  std::vector<ParticleSystem*>::iterator p;
-  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-    {
-      (*p)->simulate(frame_ratio);
-    }
-
-  // Draw particle systems (background)
-  for(p = particle_systems.begin(); p != particle_systems.end(); ++p)
-    {
-      (*p)->draw(scroll_x, 0, 0);
-    }
-  */
-
-  // Draw interactive tiles:
-  for (int y = 0; y < 15; ++y)
-    {
-      for (int x = 0; x < 21; ++x)
-        {
-          Tile::draw(32*x - fmodf(scroll_x, 32), y * 32,
-                     plevel->ia_tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
-        }
-    }
+  if(random_timer.check() || (int) last_tux_x_pos == (int) tux->get_pos().x) {
+    random_timer.start(float(rand() % 3000 + 3000) / 1000.);
+    walking = !walking;
+  } else {
+      if(!walking)
+        controller->press(Controller::JUMP);
+  }
+  last_tux_x_pos = tux->get_pos().x;
 
-  global_frame_counter++;
-  tux->key_event(SDLK_RIGHT,DOWN);
-  
-  if(random_timer.check())
-    {
-      if(walking)
-        tux->key_event(SDLK_UP,UP);
-      else
-        tux->key_event(SDLK_UP,DOWN);
-    }
-  else
-    {
-      random_timer.start(rand() % 3000 + 3000);
-      walking = !walking;
-    }
-  
   // Wrap around at the end of the level back to the beginnig
-  if(plevel->width * 32 - 320 < tux->base.x)
-    {
-      tux->base.x = tux->base.x - (plevel->width * 32 - 640);
-      scroll_x = tux->base.x - 320;
-    }
-
-  float last_tux_x_pos = tux->base.x;
-  tux->action(frame_ratio);
+  if(sector->solids->get_width() * 32 - 320 < tux->get_pos().x) {
+    sector->activate("main");
+    sector->camera->reset(tux->get_pos());
+  }
 
-  // Jump if tux stays in the same position for one loop, ie. if he is
-  // stuck behind a wall
-  if (last_tux_x_pos == tux->base.x)
-    walking = false;
-
-  tux->draw();
+  sector->action(elapsed_time);
+  sector->draw(*titlesession->context);
 }
 
 /* --- TITLE SCREEN --- */
-void title(void)
+void title()
 {
-  st_subset subset;
-  random_timer.init(true);
-
   walking = true;
+  //LevelEditor* leveleditor;
+  MusicRef credits_music;
+  controller = new CodeController();
 
-  st_pause_ticks_init();
+  Ticks::pause_init();
 
-  GameSession session(datadir + "/levels/misc/menu.stl", 0, ST_GL_DEMO_GAME);
-
-  clearscreen(0, 0, 0);
-  updatescreen();
+  titlesession = new GameSession(get_resource_filename("levels/misc/menu.stl"),
+      ST_GL_DEMO_GAME);
 
   /* Load images: */
-  bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA);
-  logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA);
-  img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
+  bkg_title = new Surface(datadir + "/images/background/arctis.jpg", false);
+  logo = new Surface(datadir + "/images/title/logo.png", true);
+  img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", true);
+
+  titlesession->get_current_sector()->activate("main");
+  titlesession->set_current();
+
+  Player* player = titlesession->get_current_sector()->player;
+  player->set_controller(controller);
 
   /* --- Main title loop: --- */
   frame = 0;
 
-  /* Draw the title background: */
-  bkg_title->draw_bg();
-
-  update_time = st_get_ticks();
-  random_timer.start(rand() % 2000 + 2000);
+  random_timer.start(float(rand() % 2000 + 2000) / 1000.0);
 
+  Uint32 lastticks = SDL_GetTicks();
+  
   Menu::set_current(main_menu);
+  DrawingContext& context = *titlesession->context;
   while (Menu::current())
     {
       // Calculate the movement-factor
-      double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
-      if(frame_ratio > 1.5) /* Quick hack to correct the unprecise CPU clocks a little bit. */
-        frame_ratio = 1.5 + (frame_ratio - 1.5) * 0.85;
-      /* Lower the frame_ratio that Tux doesn't jump to hectically throught the demo. */
-      frame_ratio /= 2;
+      Uint32 ticks = SDL_GetTicks();
+      float elapsed_time = float(ticks - lastticks) / 1000.;
+      global_time += elapsed_time;
+      lastticks = ticks;
+      // 40fps is minimum
+      if(elapsed_time > .04)
+        elapsed_time = .04;
+      
+      /* Lower the speed so that Tux doesn't jump too hectically throught
+         the demo. */
+      elapsed_time /= 2;
 
       SDL_Event event;
-      while (SDL_PollEvent(&event))
-        {
-          if (Menu::current())
-            {
-              Menu::current()->event(event);
-            }
-         // FIXME: QUIT signal should be handled more generic, not locally
-          if (event.type == SDL_QUIT)
-            Menu::set_current(0);
+      main_controller->update();
+      while (SDL_PollEvent(&event)) {
+        if (Menu::current()) {
+          Menu::current()->event(event);
         }
-
+        main_controller->process_event(event);
+        // FIXME: QUIT signal should be handled more generic, not locally
+        if (event.type == SDL_QUIT)
+          throw std::runtime_error("Received window close");
+      }
+  
       /* Draw the background: */
-      draw_background();
-      draw_demo(&session, frame_ratio);
-      
-      if (Menu::current() == main_menu)
-        logo->draw( 160, 30);
+      draw_demo(elapsed_time);
 
-      white_small_text->draw(" SuperTux " VERSION "\n"
-                             "Copyright (c) 2003 SuperTux Devel Team\n"
-                             "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
-                             "are welcome to redistribute it under certain conditions; see the file COPYING\n"
-                             "for details.\n",
-                             0, 420, 0);
+      if (Menu::current() == main_menu)
+        context.draw_surface(logo, Vector(SCREEN_WIDTH/2 - logo->w/2, 30),
+            LAYER_FOREGROUND1+1);
+
+      context.draw_text(white_small_text, " SuperTux " PACKAGE_VERSION "\n",
+              Vector(0, SCREEN_HEIGHT - 50), LEFT_ALLIGN, LAYER_FOREGROUND1);
+      context.draw_text(white_small_text,
+        _(
+"Copyright (c) 2003 SuperTux Devel Team\n"
+"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n"
+"redistribute it under certain conditions; see the file COPYING for details.\n"
+        ),
+        Vector(0, SCREEN_HEIGHT - 50 + white_small_text->get_height() + 5),
+        LEFT_ALLIGN, LAYER_FOREGROUND1);
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
       if(menu)
         {
-          menu->draw();
+          menu->draw(context);
           menu->action();
-        
+  	  
           if(menu == main_menu)
             {
               switch (main_menu->check())
                 {
-                case 0:
+                case MNID_STARTGAME:
                   // Start Game, ie. goto the slots menu
                   update_load_save_game_menu(load_game_menu);
                   break;
-                case 1:
+                case MNID_LEVELS_CONTRIB:
                   // Contrib Menu
                   puts("Entering contrib menu");
                   generate_contrib_menu();
                   break;
-                case 3:
-                  halt_music();
-                  leveleditor(1);
+#if 0
+                case MNID_LEVELEDITOR: {
+                  LevelEdtiro* leveleditor = new LevelEditor();
+                  leveleditor->run();
+                  delete leveleditor;
                   Menu::set_current(main_menu);
+                  resume_demo();
                   break;
-                case 4:
-                  display_credits();
+                }
+#endif
+                case MNID_CREDITS:
+                  fadeout(500);
+                  credits_music = sound_manager->load_music(
+                    get_resource_filename("/music/credits.ogg"));
+                  sound_manager->play_music(credits_music);
+                  display_text_file("credits.txt");
+                  fadeout(500);
                   Menu::set_current(main_menu);
                   break;
-                case 6:
+                case MNID_QUITMAINMENU:
                   Menu::set_current(0);
                   break;
                 }
@@ -327,18 +399,32 @@ void title(void)
             }
           else if(menu == load_game_menu)
             {
-              if (process_load_game_menu())
+              if(event.key.keysym.sym == SDLK_DELETE)
+                {
+                int slot = menu->get_active_item_id();
+                std::stringstream stream;
+                stream << slot;
+                std::string str = _("Are you sure you want to delete slot") + stream.str() + "?";
+                
+                if(confirm_dialog(bkg_title, str.c_str()))
+                  {
+                  str = user_dir + "/save/slot" + stream.str() + ".stsg";
+                  printf("Removing: %s\n",str.c_str());
+                  remove(str.c_str());
+                  }
+
+                update_load_save_game_menu(load_game_menu);
+                Menu::set_current(main_menu);
+                resume_demo();
+                }
+              else if (process_load_game_menu())
                 {
-                  // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
-                  // reset tux
-                  scroll_x = 0;
-                  //titletux.level_begin();
-                  update_time = st_get_ticks();
+                  resume_demo();
                 }
             }
           else if(menu == contrib_menu)
             {
-              check_contrib_menu();
+              check_levels_contrib_menu();
             }
           else if (menu == contrib_subset_menu)
             {
@@ -346,160 +432,20 @@ void title(void)
             }
         }
 
-      mouse_cursor->draw();
-      
-      flipscreen();
+      mouse_cursor->draw(context);
+     
+      context.do_drawing();
 
-      /* Set the time of the last update and the time of the current update */
-      last_update_time = update_time;
-      update_time = st_get_ticks();
+      frame_rate.update();
 
       /* Pause: */
       frame++;
-      SDL_Delay(25);
     }
   /* Free surfaces: */
 
+  free_contrib_menu();
+  delete titlesession;
   delete bkg_title;
   delete logo;
-}
-
-#define MAX_VEL 10
-#define SPEED   1
-#define SCROLL  60
-#define ITEMS_SPACE 4
-
-void display_credits()
-{
-  int done;
-  int scroll, speed;
-  int y;
-  Timer timer;
-  int length;
-  FILE* fi;
-  char temp[1024];
-  string_list_type names;
-  char filename[1024];
-  string_list_init(&names);
-  sprintf(filename,"%s/CREDITS", datadir.c_str());
-  if((fi = fopen(filename,"r")) != NULL)
-    {
-      while(fgets(temp, sizeof(temp), fi) != NULL)
-        {
-          temp[strlen(temp)-1]='\0';
-          string_list_add_item(&names,temp);
-        }
-      fclose(fi);
-    }
-  else
-    {
-      string_list_add_item(&names,"Credits were not found!");
-      string_list_add_item(&names,"Shame on the guy, who");
-      string_list_add_item(&names,"forgot to include them");
-      string_list_add_item(&names,"in your SuperTux distribution.");
-    }
-
-
-  timer.init(SDL_GetTicks());
-  timer.start(50);
-
-  scroll = 0;
-  speed = 2;
-  done = 0;
-
-  length = names.num_items;
-
-  SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
-
-  while(done == 0)
-    {
-      /* in case of input, exit */
-      SDL_Event event;
-      while(SDL_PollEvent(&event))
-        switch(event.type)
-          {
-          case SDL_KEYDOWN:
-            switch(event.key.keysym.sym)
-              {
-              case SDLK_UP:
-                speed -= SPEED;
-                break;
-              case SDLK_DOWN:
-                speed += SPEED;
-                break;
-              case SDLK_SPACE:
-              case SDLK_RETURN:
-                if(speed >= 0)
-                  scroll += SCROLL;
-                break;
-              case SDLK_ESCAPE:
-                done = 1;
-                break;
-              default:
-                break;
-              }
-            break;
-          case SDL_QUIT:
-            done = 1;
-            break;
-          default:
-            break;
-          }
-
-      if(speed > MAX_VEL)
-        speed = MAX_VEL;
-      else if(speed < -MAX_VEL)
-        speed = -MAX_VEL;
-
-      /* draw the credits */
-
-      draw_background();
-
-      white_big_text->drawf("- Credits -", 0, screen->h-scroll, A_HMIDDLE, A_TOP, 2);
-
-      y = 0;
-      for(int i = 0; i < length; i++)
-        {
-        switch(names.item[i][0])
-          {
-          case ' ':
-            white_small_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
-            y += white_small_text->h+ITEMS_SPACE;
-            break;
-          case '	':
-            white_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
-            y += white_text->h+ITEMS_SPACE;
-            break;
-          case '-':
-            white_big_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 3);
-            y += white_big_text->h+ITEMS_SPACE;
-            break;
-          default:
-            blue_text->drawf(names.item[i], 0, 60+screen->h+y-scroll, A_HMIDDLE, A_TOP, 1);
-            y += blue_text->h+ITEMS_SPACE;
-            break;
-          }
-        }
-
-      flipscreen();
-
-      if(60+screen->h+y-scroll < 0 && 20+60+screen->h+y-scroll < 0)
-        done = 1;
-
-      scroll += speed;
-      if(scroll < 0)
-        scroll = 0;
-
-      SDL_Delay(35);
-
-      if(timer.get_left() < 0)
-        {
-          frame++;
-          timer.start(50);
-        }
-    }
-  string_list_free(&names);
-
-  SDL_EnableKeyRepeat(0, 0);    // disables key repeating
-  Menu::set_current(main_menu);
+  delete img_choose_subset;
 }