put both Ryan's and my flapping code into player.cpp with mine currently activated.

[supertux.git] / src / level_subset.h

diff --git a/src/level_subset.h b/src/level_subset.h
index 4ff6b4d..4b9985e 100644 (file)
--- a/src/level_subset.h
+++ b/src/level_subset.h
@@ -23,9 +23,13 @@
 
 #include <vector>
 #include <string>
-#include "lispreader.h"
+#include "utils/lispreader.h"
 
+using namespace SuperTux;
+
+namespace SuperTux {
 class Surface;
+};
 
 /** This type holds meta-information about a level-subset. 
     It could be extended to handle manipulation of subsets. */
@@ -44,7 +48,7 @@ public:
   ~LevelSubset();
 
   static void create(const std::string& subset_name);
-  void load(const char* subset);
+  void load(const std::string& filename);
   void save();
 
   void add_level(const std::string& name);