X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flevel.h;h=521c148453533081e7f64a604e0180eef8c0100b;hb=a773fb8a2e63ec07086f4a03b1e94340ea170c73;hp=ed93b8b1fd821f137f701ab76116314a1394c76d;hpb=c8ad8bb328dd90c0ab00e4c375b9a4b8f8df6e73;p=supertux.git

diff --git a/src/level.h b/src/level.h
index ed93b8b1f..521c14845 100644
--- a/src/level.h
+++ b/src/level.h
@@ -15,6 +15,7 @@
 
 #include <string>
 #include "texture.h"
+#include "badguy.h"
 #include "lispreader.h"
 
 /* This type holds meta-information about a level-subset. */
@@ -40,8 +41,21 @@ class st_subset
 
 #define LEVEL_NAME_MAX 20
 
-struct st_level 
+
+enum TileMapType {
+ TM_BG,
+ TM_IA,
+ 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 st_level 
 {
+ public:
   std::string name;
   std::string theme;
   std::string song_title;
@@ -49,7 +63,6 @@ struct st_level
   std::string particle_system;
   unsigned int* bg_tiles[15]; /* Tiles in the background */
   unsigned int* ia_tiles[15]; /* Tiles which can interact in the game (solids for example)*/
-  unsigned int* dn_tiles[15]; /* Dynamic tiles (bad guys and moving platforms for example)*/
   unsigned int* fg_tiles[15]; /* Tiles in the foreground */
   int time_left;
   int bkgd_red;
@@ -57,16 +70,10 @@ struct st_level
   int bkgd_blue;
   int width;
   float gravity;
-};
 
-enum {
- TM_BG,
- TM_IA,
- TM_DN,
- TM_FG
- };
-
-extern texture_type img_bkgd, img_bkgd_tile[2][4], img_solid[4], img_brick[2];
+  std::vector<BadGuyData> badguy_data;
+ public:
+};
 
 void level_default  (st_level* plevel);
 int  level_load     (st_level* plevel, const char * subset, int level);