projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- moved some more level_ stuff into the levelclass
[supertux.git]
/
src
/
level.h
diff --git
a/src/level.h
b/src/level.h
index
682c569
..
dfb1c1e
100644
(file)
--- a/
src/level.h
+++ b/
src/level.h
@@
-50,16
+50,11
@@
enum TileMapType {
TM_FG
};
TM_FG
};
-extern texture_type img_bkgd;
-
-/*
-extern texture_type img_bkgd_tile[2][4];
-extern texture_type img_solid[4];
-extern texture_type img_brick[2];
-*/
class Level
{
public:
class Level
{
public:
+ texture_type img_bkgd;
+
std::string name;
std::string theme;
std::string song_title;
std::string name;
std::string theme;
std::string song_title;
@@
-92,7
+87,9
@@
class Level
int load(const std::string& filename);
void load_gfx();
int load(const std::string& filename);
void load_gfx();
+
void load_song();
void load_song();
+ void free_song();
void save(const char* subset, int level);
void save(const char* subset, int level);
@@
-104,10
+101,11
@@
class Level
/** Return the id of the tile at position x/y */
unsigned int gettileid(float x, float y);
/** Return the id of the tile at position x/y */
unsigned int gettileid(float x, float y);
+
+ void free_gfx();
+
+ void load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
};
};
-void level_load_image(texture_type* ptexture, std::string theme, const char * file, int use_alpha);
-void level_free_song();
-void level_free_gfx();
#endif /*SUPERTUX_LEVEL_H*/
#endif /*SUPERTUX_LEVEL_H*/