X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fmetascene.h;h=8d0f5c250d0547b71228484d85dc216f850682f5;hb=9fa5be20a9d53becf1f364cb5e6e277ecb74b875;hp=5d57ee010b156ae49ce8a740e2d50d0aae28ddf9;hpb=21f74bf587d9b7a76bc1ee83db02cb8c243dc567;p=laserbrain_demo

diff --git a/src/metascene.h b/src/metascene.h
index 5d57ee0..8d0f5c2 100644
--- a/src/metascene.h
+++ b/src/metascene.h
@@ -4,11 +4,11 @@
 #include <map>
 #include "scene.h"
 #include "mesh.h"
+#include "datamap.h"
 
 class MetaScene {
 public:
-	SceneSet *sceneman;
-	TextureSet *texman;
+	DataMap datamap;
 
 	std::vector<Scene*> scenes;
 
@@ -19,7 +19,7 @@ public:
 	std::map<Scene*, void*> scndata;
 
 
-	MetaScene(SceneSet *sman, TextureSet *tman);
+	MetaScene();
 	~MetaScene();
 
 	bool load(const char *fname);