1 files changed, 2 insertions, 19 deletions
diff --git a/src/worldmap.h b/src/worldmap.h
index 8813e6d..d48f36c 100644
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -21,6 +21,7 @@
 #include "levelinfo.h"
 #include "worldmapdata.h"
 #include "wmresourcemng.h"
+#include "wm_map.h"
 
 enum WMDirection {
 	LEFT,
@@ -40,18 +41,6 @@ void NewerMapDrawFunc();
 
 
 
-class dWMMap_c : public dBase_c {
-public:
-	int onCreate();
-	int onDelete();
-	int onExecute();
-	int onDraw();
-
-	static dWMMap_c *build();
-	static dWMMap_c *instance;
-};
-
-
 class dWorldCamera_c : public dBase_c {
 public:
 	int onCreate();
@@ -112,13 +101,8 @@ public:
 	dWMResourceMng_c resMng;
 	dWMPathData_c pathData;
 
-	mHeapAllocator_c allocator;
-	File modelFile;
-	m3d::mdl_c model;
-
-	void LoadModel();
-
 	daWMPlayer_c *player;
+	dWMMap_c *map;
 
 	bool isMoving;
 	WMPathPoint *currentPoint;
@@ -143,7 +127,6 @@ public:
 	int onCreate();
 	int onDelete();
 	int onExecute();
-	int onDraw();
 
 	static dScNewerWorldMap_c *build();
 	static dScNewerWorldMap_c *instance;