projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- new more bulletprof endsequence code patch from MatzeB
[supertux.git]
/
src
/
level.h
diff --git
a/src/level.h
b/src/level.h
index
9be4fd9
..
11d8181
100644
(file)
--- a/
src/level.h
+++ b/
src/level.h
@@
-25,6
+25,7
@@
#include "texture.h"
#include "badguy.h"
#include "lispreader.h"
#include "texture.h"
#include "badguy.h"
#include "lispreader.h"
+#include "musicref.h"
class Tile;
class Tile;
@@
-68,8
+69,8
@@
class Level
{
public:
Surface* img_bkgd;
{
public:
Surface* img_bkgd;
- M
ix_Music*
level_song;
- M
ix_Music*
level_song_fast;
+ M
usicRef
level_song;
+ M
usicRef
level_song_fast;
std::string name;
std::string author;
std::string name;
std::string author;
@@
-86,7
+87,6
@@
class Level
int width;
int start_pos_x;
int start_pos_y;
int width;
int start_pos_x;
int start_pos_y;
- int endpos;
float gravity;
std::vector<BadGuyData> badguy_data;
float gravity;
std::vector<BadGuyData> badguy_data;
@@
-118,8
+118,8
@@
class Level
void load_song();
void free_song();
void load_song();
void free_song();
- M
ix_Music*
get_level_music();
- M
ix_Music*
get_level_music_fast();
+ M
usicRef
get_level_music();
+ M
usicRef
get_level_music_fast();
void save(const char* subset, int level);
void save(const char* subset, int level);