Merge branch 'master' into 1.11

2021-03-24 23:07:53 +03:00
parent fdcd6d6444 6f8e0c144b
commit 1859af4a63
36 changed files with 2646 additions and 322 deletions
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -450,7 +450,7 @@ public:
 		}

 		if (_selected_object_index != -1) {
-			SetObjectToPlaceWnd(SPR_CURSOR_TRANSMITTER, PAL_NONE, HT_RECT, this);
+			SetObjectToPlaceWnd(SPR_CURSOR_TRANSMITTER, PAL_NONE, HT_RECT, this, CM_DDSP_PLACE_OBJECT);
 		}

 		this->UpdateButtons(_selected_object_class, _selected_object_index, _selected_object_view);