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

Merge branch 'jgrpp' into jgrpp-beta

Browse Source 
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
This commit is contained in:
Jonathan G Rennison
2021-10-08 18:12:04 +01:00
parent fd605e3cf3 32571a0ccd
commit 4042480806
66 changed files with 1239 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/video/null_v.cpp
View File

@@ -10,16 +10,19 @@
#include "../stdafx.h"
#include "../gfx_func.h"
#include "../blitter/factory.hpp"
#include "../saveload/saveload.h"
#include "../window_func.h"
#include "../thread.h"
#include "null_v.h"
#include <atomic>
#include "../safeguards.h"
/** Factory for the null video driver. */
static FVideoDriver_Null iFVideoDriver_Null;
extern bool _exit_game;
extern std::atomic<bool> _exit_game;
const char *VideoDriver_Null::Start(const StringList &parm)
{
@@ -63,6 +66,12 @@ void VideoDriver_Null::MainLoop()
::UpdateWindows();
}
}
/* If requested, make a save just before exit. The normal exit-flow is
* not triggered from this driver, so we have to do this manually. */
if (_settings_client.gui.autosave_on_exit) {
DoExitSave();
}
}
bool VideoDriver_Null::ChangeResolution(int w, int h) { return false; }