Merge branch 'template_train_replacement-sx' into jgrpp

# Conflicts: # src/window.cpp
2016-08-26 00:19:11 +01:00
parent 1d66e66c91 1af23b7caa
commit 761463d134
16 changed files with 232 additions and 130 deletions
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -2845,7 +2845,6 @@ static void MouseLoop(MouseClick click, int mousewheel)
 				if (HandleViewportDoubleClicked(w, x, y)) break;
 				/* FALL THROUGH */
 			case MC_LEFT:
-				DEBUG(misc, 2, "Cursor: 0x%X (%d)", _cursor.sprite, _cursor.sprite);
 				if (!HandleViewportClicked(vp, x, y, click == MC_DOUBLE_LEFT) &&
 						!(w->flags & WF_DISABLE_VP_SCROLL) &&
 						_settings_client.gui.left_mouse_btn_scrolling) {