Merge branch 'master' into win32

Conflicts:
	gui.h
	quadtree.cpp
	scene.cpp
	scene.h

1 files changed, 4 insertions, 4 deletions

diff --git a/tool.h b/tool.h
index 13a833a..5ccda41 100644
--- a/tool.h
+++ b/tool.h
@@ -1,7 +1,7 @@
 #ifndef TOOL_H
 #define TOOL_H
 
-#include "quadtree.h"
+#include "terrain.h"
 #include "vector.h"
 #include "gui.h"
 
@@ -9,11 +9,11 @@
 
 class Tool {
 	protected:
-		Quadtree *tree;
+		Terrain *terrain;
 		GUI *gui;
 
 	public:
-		Tool(Quadtree *tree);
+		Tool(Terrain *terrain);
 		virtual ~Tool() {};
 
 		virtual bool handle_event(SDL_Event& event, Vector3& selected) = 0;
@@ -26,7 +26,7 @@ class RaiseTool : public Tool {
 		static std::string name;
 
 	public:
-		RaiseTool(Quadtree *tree);
+		RaiseTool(Terrain *terrain);
 		virtual ~RaiseTool();
 
 		virtual bool handle_event(SDL_Event& event, Vector3& selected);