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/smackerscene.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/smackerscene.cpp')
| -rw-r--r-- | engines/neverhood/smackerscene.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/neverhood/smackerscene.cpp b/engines/neverhood/smackerscene.cpp index 290b8fa23c..20eebe2bc7 100644 --- a/engines/neverhood/smackerscene.cpp +++ b/engines/neverhood/smackerscene.cpp @@ -24,16 +24,16 @@ namespace Neverhood { -SmackerScene::SmackerScene(NeverhoodEngine *vm, Module *parentModule, bool doubleSurface, bool flag1, bool canAbort) - : Scene(vm, parentModule), _doubleSurface(doubleSurface), _flag1(flag1), _canAbort(canAbort), _videoPlayedBefore(false), +SmackerScene::SmackerScene(NeverhoodEngine *vm, Module *parentModule, bool doubleSurface, bool canSkip, bool canAbort) + : Scene(vm, parentModule), _doubleSurface(doubleSurface), _canSkip(canSkip), _canAbort(canAbort), _videoPlayedBefore(false), _fileHashListIndex(-1), _fileHashList(NULL), _playNextVideoFlag(false) { - debug("SmackerScene::SmackerScene(%d, %d, %d)", doubleSurface, flag1, canAbort); + debug("SmackerScene::SmackerScene(%d, %d, %d)", doubleSurface, canSkip, canAbort); // NOTE: Merged from SmackerScene::init, maybe split again if needed (incl. parameter flags) if (getGlobalVar(V_SMACKER_CAN_ABORT)) { - _flag1 = true; + _canSkip = true; _canAbort = true; } @@ -105,7 +105,7 @@ uint32 SmackerScene::handleMessage(int messageNum, const MessageParam ¶m, En uint32 messageResult = Scene::handleMessage(messageNum, param, sender); switch (messageNum) { case 0x0009: - if ((_videoPlayedBefore && _flag1) || (_canAbort && _flag1)) + if ((_videoPlayedBefore && _canSkip) || (_canAbort && _canSkip)) _playNextVideoFlag = true; break; case 0x000C: |