thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: Sync with ScummVM - rev. cd37d510f9

Browse source
This commit is contained in:
Bastien Bouclet 2019-01-26 20:47:55 +01:00
parent 0dc8726136
commit 66654cb376
194 changed files with 19108 additions and 9954 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/engine.cpp
View file

@ -26,8 +26,6 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <direct.h>
// winnt.h defines ARRAYSIZE, but we want our own one...
#undef ARRAYSIZE
#endif
#include "engines/engine.h"
@ -210,6 +208,9 @@ void initCommonGFX() {
if (gameDomain->contains("filtering"))
g_system->setFeatureState(OSystem::kFeatureFilteringMode, ConfMan.getBool("filtering"));
if (gameDomain->contains("stretch_mode"))
g_system->setStretchMode(ConfMan.get("stretch_mode").c_str());
}
}
@ -399,6 +400,17 @@ void GUIErrorMessage(const Common::String &msg) {
}
}
void GUIErrorMessageFormat(const char *fmt, ...) {
Common::String msg;
va_list va;
va_start(va, fmt);
msg = Common::String::vformat(fmt, va);
va_end(va);
GUIErrorMessage(msg);
}
void Engine::checkCD() {
#if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
// It is a known bug under Windows that games that play CD audio cause