dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Don't call abort, use RaiseException directly

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-06-11 16:46:12 +01:00
parent cb6f6f94e6
commit cca7c0ef0a
5 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/openttd.cpp
View File

@@ -123,6 +123,7 @@ extern Company *DoStartupNewCompany(bool is_ai, CompanyID company = INVALID_COMP
extern void OSOpenBrowser(const char *url);
extern void RebuildTownCaches(bool cargo_update_required, bool old_map_position);
extern void ShowOSErrorBox(const char *buf, bool system);
extern void NORETURN DoOSAbort();
extern std::string _config_file;
bool _save_config = false;
@@ -180,7 +181,7 @@ void CDECL error(const char *s, ...)
/* Set the error message for the crash log and then invoke it. */
CrashLog::SetErrorMessage(buf);
abort();
DoOSAbort();
}
void CDECL assert_msg_error(int line, const char *file, const char *expr, const char *extra, const char *str, ...)
@@ -203,7 +204,7 @@ void CDECL assert_msg_error(int line, const char *file, const char *expr, const
/* Set the error message for the crash log and then invoke it. */
CrashLog::SetErrorMessage(buf);
abort();
DoOSAbort();
}
const char *assert_tile_info(uint32 tile) {