NEVERHOOD: Try to fix the Smacker issues inside of SmackerPlayer only (instead the numerous classes using it)

SmackerPlayer now creates a surface in the constructor and deletes it in the destructor. There will be only this surface during the lifetime of the player, so there shouldn't be any issues any more when the player is reused for different Smacker files. This is imo nicer than to remove/add the surface.
I kept the several openSmacker since it wraps some code which is nice.

1 files changed, 1 insertions, 6 deletions

diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp
index 534b2b9fe0..94a68a7526 100644
--- a/engines/neverhood/diskplayerscene.cpp
+++ b/engines/neverhood/diskplayerscene.cpp
@@ -354,9 +354,7 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int
 	insertPuzzleMouse(0x000408A8, 20, 620);
 	showMouse(false);
 
-	_diskSmackerPlayer = new SmackerPlayer(_vm, this, 0x08288103, false, true);
-	addEntity(_diskSmackerPlayer);
-	addSurface(_diskSmackerPlayer->getSurface());
+	_diskSmackerPlayer = addSmackerPlayer(new SmackerPlayer(_vm, this, 0x08288103, false, true));
 	_diskSmackerPlayer->setDrawPos(154, 86);
 	_vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder());
 
@@ -474,10 +472,7 @@ uint32 DiskplayerScene::handleMessage(int messageNum, const MessageParam &param,
 }
 
 void DiskplayerScene::openSmacker(uint32 fileHash, bool keepLastFrame) {
-	// The old Smacker surface is deleted when a new Smacker is opened.
-	removeSurface(_diskSmackerPlayer->getSurface());
 	_diskSmackerPlayer->open(fileHash, keepLastFrame);
-	addSurface(_diskSmackerPlayer->getSurface());
 	_vm->_screen->setSmackerDecoder(_diskSmackerPlayer->getSmackerDecoder());
 	_palette->usePalette();
 }