ALL: Sync with ScummVM - rev. 823c2f899b

This commit is contained in:
Pawel Kolodziejski 2016-11-12 08:49:29 +01:00
parent 368d71cfd5
commit 9ba9c69b3f
241 changed files with 35724 additions and 10087 deletions

View file

@ -35,11 +35,13 @@
#include "common/error.h"
#include "common/textconsole.h"
#include "backends/audiocd/win32/win32-audiocd.h"
#include "backends/platform/sdl/win32/win32.h"
#include "backends/platform/sdl/win32/win32-window.h"
#include "backends/saves/windows/windows-saves.h"
#include "backends/fs/windows/windows-fs-factory.h"
#include "backends/taskbar/win32/win32-taskbar.h"
#include "backends/updates/win32/win32-updates.h"
#include "common/memstream.h"
@ -81,6 +83,11 @@ void OSystem_Win32::initBackend() {
if (_savefileManager == 0)
_savefileManager = new WindowsSaveFileManager();
#if defined(USE_SPARKLE)
// Initialize updates manager
_updateManager = new Win32UpdateManager();
#endif
// Invoke parent implementation of this method
OSystem_SDL::initBackend();
}
@ -318,4 +325,8 @@ void OSystem_Win32::addSysArchivesToSearchSet(Common::SearchSet &s, int priority
OSystem_SDL::addSysArchivesToSearchSet(s, priority);
}
AudioCDManager *OSystem_Win32::createAudioCDManager() {
return createWin32AudioCDManager();
}
#endif