diff options
| author | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2013-10-28 18:23:05 +0100 |
| commit | ad586412425e66e0e678f0cfd7b8c78c58a8a855 (patch) | |
| tree | f2c5d918ee991e4caaf299bb3fcc147ef405d808 /engines/wintermute/video | |
| parent | 5653a89e81d600b2388831cfe05c36d3068813b5 (diff) | |
| download | scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.gz scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.tar.bz2 scummvm-rg350-ad586412425e66e0e678f0cfd7b8c78c58a8a855.zip | |
WINTERMUTE: Fix compile errors in XCode 5 caused by nullptr-issues.
Diffstat (limited to 'engines/wintermute/video')
| -rw-r--r-- | engines/wintermute/video/video_theora_player.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index a4f1b9edd6..7b28a71e17 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -62,7 +62,7 @@ public: //CVidSubtitler *_subtitler; // control methods - bool initialize(const Common::String &filename, const Common::String &subtitleFile = nullptr); + bool initialize(const Common::String &filename, const Common::String &subtitleFile = Common::String()); bool initializeSimple(); bool update(); bool play(TVideoPlayback type = VID_PLAY_CENTER, int x = 0, int y = 0, bool freezeGame = false, bool freezeMusic = true, bool looping = false, uint32 startTime = 0, float forceZoom = -1.0f, int volume = -1); |