Merge branch upstream/master

2021-11-28 01:52:06 +02:00
parent d08040a7a9 501087058e
commit 41edadab81
108 changed files with 2653 additions and 1096 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