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

ALL: Sync with ScummVM - rev. 2586ca2345

Browse source
This commit is contained in:
Bastien Bouclet 2018-07-31 18:24:44 +02:00
parent ff56446d6a
commit 53759fe53a
214 changed files with 17297 additions and 12700 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/engine.cpp
View file

@ -259,11 +259,12 @@ void splashScreen() {
logo->free();
delete logo;
g_system->updateScreen();
// Delay 0.6 secs
uint time0 = g_system->getMillis();
Common::Event event;
while (time0 + 600 > g_system->getMillis()) {
g_system->updateScreen();
(void)g_system->getEventManager()->pollEvent(event);
g_system->delayMillis(10);
}
@ -328,6 +329,15 @@ void initGraphics(int width, int height, const Graphics::PixelFormat *format) {
dialog.runModal();
}
if (gfxError & OSystem::kTransactionStretchModeSwitchFailed) {
Common::String message = _("Could not switch to stretch mode: '");
message += ConfMan.get("stretch_mode");
message += "'.";
GUI::MessageDialog dialog(message);
dialog.runModal();
}
if (gfxError & OSystem::kTransactionAspectRatioFailed) {
GUI::MessageDialog dialog(_("Could not apply aspect ratio setting."));
dialog.runModal();