diff options
author | johndoe123 | 2013-01-18 08:44:38 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:47:40 +0200 |
commit | eea9dbe2da9c6195431f234e89671fffd1e1ac29 (patch) | |
tree | 8223f8611ddd63ea1ddb131f670c0fff8cc27e5f /engines/neverhood/module.cpp | |
parent | 51979c4f3f522c6d98290b93de7ecad141980b42 (diff) | |
download | scummvm-rg350-eea9dbe2da9c6195431f234e89671fffd1e1ac29.tar.gz scummvm-rg350-eea9dbe2da9c6195431f234e89671fffd1e1ac29.tar.bz2 scummvm-rg350-eea9dbe2da9c6195431f234e89671fffd1e1ac29.zip |
NEVERHOOD: Minor renaming and cleanup
Diffstat (limited to 'engines/neverhood/module.cpp')
-rw-r--r-- | engines/neverhood/module.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engines/neverhood/module.cpp b/engines/neverhood/module.cpp index 36607d771f..93b4134f6b 100644 --- a/engines/neverhood/module.cpp +++ b/engines/neverhood/module.cpp @@ -67,7 +67,6 @@ uint32 Module::handleMessage(int messageNum, const MessageParam ¶m, Entity * } NavigationScene *Module::navigationScene() { - // Not so nice return (NavigationScene*)_childObject; } @@ -76,19 +75,17 @@ void Module::createNavigationScene(uint32 navigationListId, int navigationIndex, _childObject = new NavigationScene(_vm, this, navigationListId, navigationIndex, itemsTypes); } -void Module::createSmackerScene(uint32 fileHash, bool doubleSurface, bool flag1, bool canAbort) { - SmackerScene *smackerScene; +void Module::createSmackerScene(uint32 fileHash, bool doubleSurface, bool canSkip, bool canAbort) { _sceneType = kSceneTypeSmacker; - smackerScene = new SmackerScene(_vm, this, doubleSurface, flag1, canAbort); + SmackerScene *smackerScene = new SmackerScene(_vm, this, doubleSurface, canSkip, canAbort); smackerScene->setFileHash(fileHash); smackerScene->nextVideo(); _childObject = smackerScene; } -void Module::createSmackerScene(const uint32 *fileHashList, bool doubleSurface, bool flag1, bool canAbort) { - SmackerScene *smackerScene; +void Module::createSmackerScene(const uint32 *fileHashList, bool doubleSurface, bool canSkip, bool canAbort) { _sceneType = kSceneTypeSmacker; - smackerScene = new SmackerScene(_vm, this, doubleSurface, flag1, canAbort); + SmackerScene *smackerScene = new SmackerScene(_vm, this, doubleSurface, canSkip, canAbort); smackerScene->setFileHashList(fileHashList); smackerScene->nextVideo(); _childObject = smackerScene; |