diff options
| author | johndoe123 | 2013-01-10 23:17:16 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:47:39 +0200 |
| commit | 9963ce41ea5f2c733873f16fd47be9b060dd2d16 (patch) | |
| tree | fec018b13fc89db17390c38efbc8e4cbaab89b2f /engines/neverhood/diskplayerscene.cpp | |
| parent | 4b7ad48ca8857fd0c597ae1cc1ce599a3286bd57 (diff) | |
| download | scummvm-rg350-9963ce41ea5f2c733873f16fd47be9b060dd2d16.tar.gz scummvm-rg350-9963ce41ea5f2c733873f16fd47be9b060dd2d16.tar.bz2 scummvm-rg350-9963ce41ea5f2c733873f16fd47be9b060dd2d16.zip | |
NEVERHOOD: Merge CollisionMan into Scene class
Diffstat (limited to 'engines/neverhood/diskplayerscene.cpp')
| -rw-r--r-- | engines/neverhood/diskplayerscene.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/neverhood/diskplayerscene.cpp b/engines/neverhood/diskplayerscene.cpp index fbef6006d5..907e027bc3 100644 --- a/engines/neverhood/diskplayerscene.cpp +++ b/engines/neverhood/diskplayerscene.cpp @@ -316,7 +316,7 @@ void DiskplayerSlot::stop() { } DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int paletteIndex) - : Scene(vm, parentModule, true), _diskIndex(0), _appearCountdown(0), _tuneInCountdown(0), + : Scene(vm, parentModule), _diskIndex(0), _appearCountdown(0), _tuneInCountdown(0), _hasAllDisks(false), _dropKey(false), _inputDisabled(true), _updateStatus(kUSStopped) { int availableDisksCount = 0; @@ -325,7 +325,7 @@ DiskplayerScene::DiskplayerScene(NeverhoodEngine *vm, Module *parentModule, int setPalette(kDiskplayerPaletteFileHashes[paletteIndex]); _ssPlayButton = insertSprite<DiskplayerPlayButton>(this); - _vm->_collisionMan->addCollisionSprite(_ssPlayButton); + addCollisionSprite(_ssPlayButton); _asKey = insertSprite<AsDiskplayerSceneKey>(); |