X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.h;h=11d8181354b2bf1444dd94264f152b549fb9c388;hb=a5123e6e7071da6d73a1ef0b19bf4acb19981605;hp=9be4fd9af984a850c7e93653646f240f6d2d3e23;hpb=ebd0b704b1b446edad786135877ae74d5670949a;p=supertux.git diff --git a/src/level.h b/src/level.h index 9be4fd9af..11d818135 100644 --- a/src/level.h +++ b/src/level.h @@ -25,6 +25,7 @@ #include "texture.h" #include "badguy.h" #include "lispreader.h" +#include "musicref.h" class Tile; @@ -68,8 +69,8 @@ class Level { public: Surface* img_bkgd; - Mix_Music* level_song; - Mix_Music* level_song_fast; + MusicRef level_song; + MusicRef level_song_fast; std::string name; std::string author; @@ -86,7 +87,6 @@ class Level int width; int start_pos_x; int start_pos_y; - int endpos; float gravity; std::vector badguy_data; @@ -118,8 +118,8 @@ class Level void load_song(); void free_song(); - Mix_Music* get_level_music(); - Mix_Music* get_level_music_fast(); + MusicRef get_level_music(); + MusicRef get_level_music_fast(); void save(const char* subset, int level);