X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Ftitle.cpp;h=714f9bd0b5ec83bdb56406e4a7320167ed255f3d;hb=6f801c22d97251799740317fb1d0caf2e744b321;hp=8c59ccae97d42993ec21b8f250c17e9048e497ab;hpb=bb22629b500e92919cdda59597bad8f2f963bdf9;p=supertux.git diff --git a/src/title.cpp b/src/title.cpp index 8c59ccae9..714f9bd0b 100644 --- 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); @@ -484,6 +484,3 @@ void title(void) delete img_choose_subset; } - -// EOF // -