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

Merge branch 'cpp-11' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2019-02-13 18:51:53 +00:00
parent 46b5b0155c 466b9a9595
commit 1db19208ba
108 changed files with 795 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/saveload/saveload.cpp
View File

@@ -395,18 +395,21 @@ void NORETURN SlErrorCorrupt(const char *msg, bool already_malloced)
}
/**
* As SlErrorCorruptFmt, except that it takes a format string and additional parameters
* Issue an SlErrorCorrupt with a format string.
* @param format format string
* @param ... arguments to format string
* @note This function does never return as it throws an exception to
* break out of all the saveload code.
*/
void NORETURN CDECL SlErrorCorruptFmt(const char *msg, ...)
void NORETURN CDECL SlErrorCorruptFmt(const char *format, ...)
{
va_list va;
va_start(va, msg);
char *str = str_vfmt(msg, va);
va_start(va, format);
char *str = str_vfmt(format, va);
va_end(va);
SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME, str, true);
}
typedef void (*AsyncSaveFinishProc)(); ///< Callback for when the savegame loading is finished.
static AsyncSaveFinishProc _async_save_finish = NULL; ///< Callback to call when the savegame loading is finished.
static ThreadObject *_save_thread; ///< The thread we're using to compress and write a savegame