aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm/insane
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-10-10 12:16:21 +0000
committerPaweł Kołodziejski2006-10-10 12:16:21 +0000
commite85ab4b10fedf9660efffb386512ed6a36956422 (patch)
tree2d0bbc3814009f3527d7926cd0f5674fdfcace68 /engines/scumm/insane
parent89f79acb84071d56c3758281287d9c3b0c0ed545 (diff)
downloadscummvm-rg350-e85ab4b10fedf9660efffb386512ed6a36956422.tar.gz
scummvm-rg350-e85ab4b10fedf9660efffb386512ed6a36956422.tar.bz2
scummvm-rg350-e85ab4b10fedf9660efffb386512ed6a36956422.zip
now SmushPlayer is class created once same as SmushMixer while scumm engine creation. this allow finish play smush audio track finished to the end instead immediately stopped as it was happen before
svn-id: r24263
Diffstat (limited to 'engines/scumm/insane')
-rw-r--r--engines/scumm/insane/insane.cpp2
-rw-r--r--engines/scumm/insane/insane_scenes.cpp4
2 files changed, 2 insertions, 4 deletions
diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index 86deddeda1..919baa143b 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -620,7 +620,7 @@ void Insane::startVideo(const char *filename, int num, int argC, int frameRate,
smush_setupSanFromStart(filename, 0, -1, -1, 0);
}
- _player->play(filename, offset, startFrame);
+ _player->play(filename, _speed, offset, startFrame);
}
void Insane::smush_warpMouse(int x, int y, int buttons) {
diff --git a/engines/scumm/insane/insane_scenes.cpp b/engines/scumm/insane/insane_scenes.cpp
index 5beca36999..dcc78a840b 100644
--- a/engines/scumm/insane/insane_scenes.cpp
+++ b/engines/scumm/insane/insane_scenes.cpp
@@ -36,7 +36,7 @@ namespace Scumm {
void Insane::runScene(int arraynum) {
_insaneIsRunning = true;
- _player = new SmushPlayer(_vm, _speed);
+ _player = _vm->_splayer;
_player->insanity(true);
_numberArray = arraynum;
@@ -170,8 +170,6 @@ void Insane::runScene(int arraynum) {
}
// insane_unlock(); // FIXME
_vm->_sound->stopAllSounds(); // IMUSE_StopAllSounds();
-
- delete _player;
}
int Insane::initScene(int sceneId) {