Merge branch 'master' into jgrpp

# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp

src/smallmap_gui.cpp

@@ -1543,7 +1543,7 @@ void SmallMapWindow::SetNewScroll(int sx, int sy, int sub)
 
 /* virtual */ void SmallMapWindow::OnScroll(Point delta)
 {
-	_cursor.fix_at = true;
+	if (_settings_client.gui.scroll_mode == VSM_VIEWPORT_RMB_FIXED || _settings_client.gui.scroll_mode == VSM_MAP_RMB_FIXED) _cursor.fix_at = true;
 
 	/* While tile is at (delta.x, delta.y)? */
 	int sub;