X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=7d828cbcc200d56d806d31ade3d43fb5e93b76e2;hb=f80ec06ce6d95942926c8ea8ac8c6fb872f9330e;hp=7b3b89d41bf93b011849ae850acc650ad06f75d1;hpb=717f10b21efba0b9b3dcd844df219c652a18797a;p=supertux.git

diff --git a/src/title.cpp b/src/title.cpp
index 7b3b89d41..7d828cbcc 100644
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -37,14 +37,11 @@
 #include <ctype.h>
 #endif
 
-#include "app/globals.h"
 #include "title.h"
 #include "video/screen.h"
 #include "video/surface.h"
 #include "gui/menu.h"
 #include "timer.h"
-#include "special/frame_rate.h"
-#include "app/setup.h"
 #include "lisp/lisp.h"
 #include "lisp/parser.h"
 #include "level.h"
@@ -59,19 +56,20 @@
 #include "object/camera.h"
 #include "object/player.h"
 #include "resources.h"
-#include "app/gettext.h"
+#include "gettext.h"
 #include "misc.h"
 #include "textscroller.h"
+#include "file_system.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 Surface* img_choose_subset;
 
 static bool walking;
-static Timer2 random_timer;
+static Timer random_timer;
 
 static int frame;
 
@@ -81,8 +79,6 @@ static CodeController* controller;
 static std::vector<LevelSubset*> contrib_subsets;
 static LevelSubset* current_contrib_subset = 0;
 
-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.
@@ -93,7 +89,7 @@ void resume_demo()
   titlesession->get_current_sector()->activate("main");
   titlesession->set_current();
 
-  frame_rate.update();
+  //frame_rate.update();
 }
 
 void update_load_save_game_menu(Menu* menu)
@@ -225,20 +221,16 @@ void check_levels_contrib_menu()
 void check_contrib_subset_menu()
 {
   int index = contrib_subset_menu->check();
-  if (index != -1)
-    {
-      if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION)
-        {
-          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();
-        }
-    }  
+  if (index != -1) {
+    if (contrib_subset_menu->get_item_by_id(index).kind == MN_ACTION) {
+      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_demo(float elapsed_time)
@@ -254,14 +246,12 @@ void draw_demo(float elapsed_time)
   controller->press(Controller::RIGHT);
   
   if(random_timer.check() || 
-      (walking && (int) last_tux_x_pos == (int) tux->get_pos().x)) {
+      (walking && fabsf(last_tux_x_pos - tux->get_pos().x)) < .1) {
     walking = false;
-    printf("Walking: %d.\n", walking);
   } else {
-      if(!walking && (int) tux->get_pos().y == (int) last_tux_y_pos) {
+      if(!walking && fabsf(tux->get_pos().y - last_tux_y_pos) < .1) {
         random_timer.start(float(rand() % 3000 + 3000) / 1000.);
         walking = true;
-        printf("Walking: %d.\n", walking);
       }
   }
   if(!walking)
@@ -287,15 +277,13 @@ void title()
   MusicRef credits_music;
   controller = new CodeController();
 
-  Ticks::pause_init();
-
   titlesession = new GameSession(get_resource_filename("levels/misc/menu.stl"),
       ST_GL_DEMO_GAME);
 
   /* Load images: */
   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);
+  logo = new Surface(datadir + "/images/engine/menu/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();
@@ -374,7 +362,6 @@ void title()
                   break;
                 case MNID_LEVELS_CONTRIB:
                   // Contrib Menu
-                  puts("Entering contrib menu");
                   generate_contrib_menu();
                   break;
 #if 0
@@ -450,7 +437,7 @@ void title()
      
       context.do_drawing();
 
-      frame_rate.update();
+      //frame_rate.update();
 
       /* Pause: */
       frame++;
@@ -461,5 +448,5 @@ void title()
   delete titlesession;
   delete bkg_title;
   delete logo;
-  delete img_choose_subset;
+  //delete img_choose_subset;
 }