Merge 1.7.0-RC1

This commit is contained in:
Pavel Stupnikov
2017-04-09 22:34:33 +03:00
262 changed files with 4673 additions and 3860 deletions
+2 -2
View File
@@ -1,4 +1,4 @@
/* $Id: crashlog.cpp 27590 2016-05-29 19:01:50Z frosch $ */
/* $Id: crashlog.cpp 27653 2016-09-04 16:06:50Z alberth $ */
/*
* This file is part of OpenTTD.
@@ -388,7 +388,7 @@ bool CrashLog::WriteSavegame(char *filename, const char *filename_last) const
seprintf(filename, filename_last, "%scrash.sav", _personal_dir);
/* Don't do a threaded saveload. */
return SaveOrLoad(filename, SL_SAVE, NO_DIRECTORY, false) == SL_OK;
return SaveOrLoad(filename, SLO_SAVE, DFT_GAME_FILE, NO_DIRECTORY, false) == SL_OK;
} catch (...) {
return false;
}