Merge branch 'cpp-11' into enhanced_viewport_overlay

# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
#	src/smallmap_gui.cpp

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) &&
 						!(w->flags & WF_DISABLE_VP_SCROLL) &&
 						_settings_client.gui.left_mouse_btn_scrolling) {
@@ -3051,6 +3050,10 @@ void UpdateWindows()
 		w->ProcessHighlightedInvalidations();
 	}
 
+	/* Skip the actual drawing on dedicated servers without screen.
+	 * But still empty the invalidation queues above. */
+	if (_network_dedicated) return;
+
 	static int we4_timer = 0;
 	int t = we4_timer + 1;