some cleanups memory leak fixes and moving of source files

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index a173966..714f9bd 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -52,14 +52,14 @@
 #include "worldmap.h"
 #include "leveleditor.h"
 #include "scene.h"
-#include "player.h"
 #include "tile.h"
 #include "sector.h"
-#include "tilemap.h"
+#include "object/tilemap.h"
+#include "object/camera.h"
+#include "object/player.h"
 #include "resources.h"
 #include "app/gettext.h"
 #include "misc.h"
-#include "camera.h"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -279,7 +279,6 @@ void draw_demo(float elapsed_time)
 
   world->play_music(LEVEL_MUSIC);
   
-  global_frame_counter++;
   tux->key_event((SDLKey) keymap.right,DOWN);
   
   if(random_timer.check()) {
@@ -323,7 +322,8 @@ void title(void)
 
   Ticks::pause_init();
 
-  titlesession = new GameSession("misc/menu.stl", ST_GL_DEMO_GAME);
+  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);
@@ -417,7 +417,7 @@ void title(void)
                   break;
                 case MNID_CREDITS:
                   fadeout(500);
-                  display_text_file("CREDITS", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
+                  display_text_file("credits.txt", SCROLL_SPEED_CREDITS, white_big_text , white_text, white_small_text, blue_text );
                   fadeout(500);
                   Menu::set_current(main_menu);
                   break;
@@ -484,6 +484,3 @@ void title(void)
   delete img_choose_subset;
 }
 
-
-// EOF //
-