Update to 12.0-beta1

2021-08-15 14:57:29 +03:00
parent ac7d3eba75
commit 9df4f2c4fc
666 changed files with 61302 additions and 20466 deletions
@@ -44,11 +44,15 @@ public:
 	~ErrorMessageData();
 	ErrorMessageData(StringID summary_msg, StringID detailed_msg, uint duration = 0, int x = 0, int y = 0, const GRFFile *textref_stack_grffile = nullptr, uint textref_stack_size = 0, const uint32 *textref_stack = nullptr);

+	/* Remove the copy assignment, as the default implementation will not do the right thing. */
+	ErrorMessageData &operator=(ErrorMessageData &rhs) = delete;
+
 	/** Check whether error window shall display a company manager face */
 	bool HasFace() const { return face != INVALID_COMPANY; }

 	void SetDParam(uint n, uint64 v);
 	void SetDParamStr(uint n, const char *str);
+	void SetDParamStr(uint n, const std::string &str);

 	void CopyOutDParams();
 };