Merge remote-tracking branch 'upstream/1.11' into 1.11

2021-04-01 17:33:31 +03:00
parent 14f71187eb ec1f91e865
commit 93d8111960
125 changed files with 2828 additions and 1149 deletions
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -194,8 +194,7 @@ public:
 		} else {
 			this->SelectFirstAvailableObject(true);
 		}
-		ObjectClass *objclass = ObjectClass::Get(_selected_object_class);
-		assert(objclass->GetUISpecCount() > 0); // object GUI should be disabled elsewise
+		assert(ObjectClass::Get(_selected_object_class)->GetUISpecCount() > 0); // object GUI should be disabled elsewise
 	}

 	void SetStringParameters(int widget) const override