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

@ -83,6 +83,7 @@ public:
// ResidualVM specific code
virtual void setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d) override;
// ResidualVM specific code
virtual void launcherInitSize(uint w, uint h) override;
protected:
@ -119,6 +120,11 @@ protected:
*/
virtual void initSDL();
/**
* Create the audio CD manager
*/
virtual AudioCDManager *createAudioCDManager();
// Logging
virtual Common::WriteStream *createLogFile() { return 0; }
Backends::Log::Log *_logger;