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.cpp
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2019-02-04 18:24:38 +00:00
parent 02e2627765 09c62d6951
commit 46b5b0155c
280 changed files with 11624 additions and 3855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/openttd.cpp
View File

@@ -117,7 +117,9 @@ void CDECL error(const char *s, ...)
vseprintf(buf, lastof(buf), s, va);
va_end(va);
ShowOSErrorBox(buf, true);
if (VideoDriver::GetInstance() == NULL || VideoDriver::GetInstance()->HasGUI()) {
ShowOSErrorBox(buf, true);
}
/* Set the error message for the crash log and then invoke it. */
CrashLog::SetErrorMessage(buf);
@@ -240,7 +242,7 @@ static void ShowHelp()
static void WriteSavegameInfo(const char *name)
{
extern uint16 _sl_version;
extern SaveLoadVersion _sl_version;
uint32 last_ottd_rev = 0;
byte ever_modified = 0;
bool removed_newgrfs = false;