Merge remote-tracking branch 'upstream/master' into 13.0

2023-02-03 15:48:54 +04:00
parent 5c5e747fd7 4754d5cde5
commit 2b3c725384
159 changed files with 6991 additions and 4963 deletions
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -119,6 +119,7 @@ public:

 		NWidgetMatrix *matrix = this->GetWidget<NWidgetMatrix>(WID_BO_SELECT_MATRIX);
 		matrix->SetScrollbar(this->GetScrollbar(WID_BO_SELECT_SCROLL));
+		matrix->SetCount(ObjectClass::Get(_selected_object_class)->GetUISpecCount());

 		this->GetWidget<NWidgetMatrix>(WID_BO_OBJECT_MATRIX)->SetCount(4);