Merge branch 'master' into jgrpp

2020-10-14 17:38:23 +01:00
parent 5edb080deb 313141d2f1
commit d85a529f87
61 changed files with 2031 additions and 1507 deletions
--- a/src/error.h
+++ b/src/error.h
@@ -56,6 +56,7 @@ public:
 void ScheduleErrorMessage(const ErrorMessageData &data);

 void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0, const GRFFile *textref_stack_grffile = nullptr, uint textref_stack_size = 0, const uint32 *textref_stack = nullptr, StringID extra_msg = INVALID_STRING_ID);
+bool HideActiveErrorMessage();
 void ClearErrorMessages();
 void ShowFirstError();
 void UnshowCriticalError();