PINK: small fixes

scummvm · Jun 28, 2018 · e48ac17 · e48ac17
1 parent 475f6a6
commit e48ac17
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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) {