Merge branch 'master' into win32

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

1 files changed, 6 insertions, 6 deletions

diff --git a/tool.cpp b/tool.cpp
index 83353b4..d96a45f 100644
--- a/tool.cpp
+++ b/tool.cpp
@@ -1,8 +1,8 @@
 #include "tool.h"
 
 /* Tool */
-Tool::Tool(Quadtree *tree) {
-	this->tree = tree;
+Tool::Tool(Terrain *terrain) {
+	this->terrain = terrain;
 }
 
 void Tool::render_gui() {
@@ -10,7 +10,7 @@ void Tool::render_gui() {
 }
 
 /* RaiseTool */
-RaiseTool::RaiseTool(Quadtree *tree) : Tool(tree) {
+RaiseTool::RaiseTool(Terrain *terrain) : Tool(terrain) {
 	gui = new RaiseWindow();
 }
 
@@ -25,12 +25,12 @@ bool RaiseTool::handle_event(SDL_Event& event, Vector3& selected) {
 		case SDL_MOUSEBUTTONUP:
 			switch(event.button.button) {
 				case SDL_BUTTON_WHEELUP:
-					tree->raise(selected.x, selected.z, wnd->get_radius(), wnd->get_focus(),
+					terrain->raise(selected.x, selected.z, wnd->get_radius(), wnd->get_focus(),
 							wnd->get_strength());
 					return true;
 				case SDL_BUTTON_WHEELDOWN:
-					tree->raise(selected.x, selected.z, wnd->get_radius(), wnd->get_focus(),
-							-wnd->get_strength());
+					terrain->raise(selected.x, selected.z, wnd->get_radius(), wnd->get_focus(),
+							wnd->get_strength(), false);
 					return true;
 			}
 	}