libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-12 06:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GRIM: Don't assert out when failing to open a video

Browse Source
This commit is contained in:
Matthew Hoops 2011-08-15 15:11:15 -04:00
parent 3c1957e902
commit 282d3e221c
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/grim/movie/bink.cpp
View File

@ -88,7 +88,6 @@ void BinkPlayer::init() {
void BinkPlayer::deinit() {
g_system->getTimerManager()->removeTimerProc(&timerCallback);
_binkDecoder->close();
_f.close();
_surface->free();
if (_externalBuffer) {
@ -153,9 +152,10 @@ bool BinkPlayer::play(const char *filename, bool looping, int x, int y) {
_y = y;
_fname = filename;
_fname += ".bik";
_f.open(_fname);
_binkDecoder->loadStream(&_f);
if (!_binkDecoder->loadFile(_fname))
return false;
if (gDebugLevel == DEBUG_SMUSH)
printf("Playing video '%s'.\n", filename);

1
engines/grim/movie/bink.h
View File

@ -47,7 +47,6 @@ namespace Grim {
class BinkPlayer : public MoviePlayer {
private:
Common::File _f;
Video::BinkDecoder *_binkDecoder;
Graphics::Surface *_surface, *_externalSurface;
public: