diff options
author | whiterandrek | 2018-03-31 20:20:16 +0300 |
---|---|---|
committer | Eugene Sandulenko | 2018-06-28 23:51:32 +0200 |
commit | e48ac17f68ccd1b4432d9d6e15e811a88ea8daf4 (patch) | |
tree | 040a779d027ec2085888deaa5cd27f9f79c3eec0 | |
parent | 475f6a62bdaa058cff6371989004291fcec9feb1 (diff) | |
download | scummvm-rg350-e48ac17f68ccd1b4432d9d6e15e811a88ea8daf4.tar.gz scummvm-rg350-e48ac17f68ccd1b4432d9d6e15e811a88ea8daf4.tar.bz2 scummvm-rg350-e48ac17f68ccd1b4432d9d6e15e811a88ea8daf4.zip |
PINK: small fixes
-rw-r--r-- | engines/pink/file.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/handlers/handler.cpp | 2 | ||||
-rw-r--r-- | engines/pink/objects/module.cpp | 8 | ||||
-rw-r--r-- | engines/pink/sound.cpp | 4 |
4 files changed, 6 insertions, 10 deletions
diff --git a/engines/pink/file.cpp b/engines/pink/file.cpp index b308c5ba6c..5158601164 100644 --- a/engines/pink/file.cpp +++ b/engines/pink/file.cpp @@ -75,7 +75,7 @@ bool OrbFile::open(const Common::String &name) { void OrbFile::loadGame(PinkEngine *game) { seekToObject("PinkGame"); Archive archive(*this); - archive.mapObject((Object *) game); // hack + archive.mapObject(reinterpret_cast<Object*>(game)); // hack game->load(archive); } diff --git a/engines/pink/objects/handlers/handler.cpp b/engines/pink/objects/handlers/handler.cpp index 0e9261695c..a848cfd98e 100644 --- a/engines/pink/objects/handlers/handler.cpp +++ b/engines/pink/objects/handlers/handler.cpp @@ -65,7 +65,7 @@ void HandlerSequences::onMessage(LeadActor *actor) { Handler::onMessage(actor); Sequencer *sequencer = actor->getSequencer(); - assert(_sequences.size()); + assert(!_sequences.empty()); Common::RandomSource &rnd = actor->getPage()->getGame()->getRnd(); uint index = rnd.getRandomNumber(_sequences.size() - 1); diff --git a/engines/pink/objects/module.cpp b/engines/pink/objects/module.cpp index f78f290abe..a8166dee43 100644 --- a/engines/pink/objects/module.cpp +++ b/engines/pink/objects/module.cpp @@ -50,11 +50,9 @@ void Module::init(bool isLoadingSave, const Common::String &pageName) { // 0 0 - new game // 0 1 - module changed // 1 0 - from save - if (!pageName.empty()) { + if (!pageName.empty()) _page = findPage(pageName); - } - - if (!_page) + else if (!_page) _page = _pages[0]; _page->init(isLoadingSave); @@ -67,7 +65,6 @@ void Module::changePage(const Common::String &pageName) { //_page->clear - page->init(kLoadingNewGame); } @@ -78,7 +75,6 @@ GamePage *Module::findPage(const Common::String &pageName) const { }); } - PinkEngine *Module::getGame() const { return _game; } diff --git a/engines/pink/sound.cpp b/engines/pink/sound.cpp index 73899a3438..b02275181e 100644 --- a/engines/pink/sound.cpp +++ b/engines/pink/sound.cpp @@ -34,8 +34,8 @@ Sound::Sound(Audio::Mixer *mixer, Common::SeekableReadStream *stream) } Sound::~Sound() { - //look for mem leak stop(); + delete _stream; } bool Sound::isPlaying() { @@ -64,7 +64,7 @@ void Sound::play(Audio::Mixer::SoundType type, int volume, bool isLoop) { _stream = Audio::makeLoopingAudioStream(seekableStream, 0, 0, 0); } - _mixer->playStream(type, &_handle ,_stream, -1 , Audio::Mixer::kMaxChannelVolume, 0,DisposeAfterUse::NO); + _mixer->playStream(type, &_handle ,_stream, -1 , Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO); } bool Sound::load(Common::SeekableReadStream *stream) { |