From eea9dbe2da9c6195431f234e89671fffd1e1ac29 Mon Sep 17 00:00:00 2001 From: johndoe123 Date: Fri, 18 Jan 2013 08:44:38 +0000 Subject: NEVERHOOD: Minor renaming and cleanup --- engines/neverhood/module.cpp | 11 ++++------- engines/neverhood/module.h | 4 ++-- engines/neverhood/module1000.cpp | 19 +++++++++---------- engines/neverhood/module1000.h | 2 +- engines/neverhood/smackerscene.cpp | 10 +++++----- engines/neverhood/smackerscene.h | 4 ++-- 6 files changed, 23 insertions(+), 27 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; diff --git a/engines/neverhood/module.h b/engines/neverhood/module.h index b91b9deff6..e98012cbea 100644 --- a/engines/neverhood/module.h +++ b/engines/neverhood/module.h @@ -58,8 +58,8 @@ protected: uint32 handleMessage(int messageNum, const MessageParam ¶m, Entity *sender); NavigationScene *navigationScene(); void createNavigationScene(uint32 navigationListId, int navigationIndex, const byte *itemsTypes = NULL); - void createSmackerScene(uint32 fileHash, bool doubleSurface, bool flag1, bool canAbort); - void createSmackerScene(const uint32 *fileHashList, bool doubleSurface, bool flag1, bool canAbort); + void createSmackerScene(uint32 fileHash, bool doubleSurface, bool canSkip, bool canAbort); + void createSmackerScene(const uint32 *fileHashList, bool doubleSurface, bool canSkip, bool canAbort); void createStaticScene(uint32 backgroundFileHash, uint32 cursorFileHash); void createDemoScene(); bool updateChild(); diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp index 12fe408040..0329f589a4 100644 --- a/engines/neverhood/module1000.cpp +++ b/engines/neverhood/module1000.cpp @@ -1175,7 +1175,7 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which) _ssLadderArchPart2 = insertStaticSprite(0xB2A423B0, 1100); _ssLadderArchPart3 = insertStaticSprite(0x316E0772, 1100); - _class599 = insertStaticSprite(0x316C4BB4, 1015); + _ssCeiling = insertStaticSprite(0x316C4BB4, 1015); if (which < 0) { // Restoring game @@ -1231,11 +1231,11 @@ Scene1002::Scene1002(NeverhoodEngine *vm, Module *parentModule, int which) tempClipRect.set(tempSprite->getDrawRect().x, tempSprite->getDrawRect().y, _ssLadderArchPart2->getDrawRect().x2(), _ssLadderArchPart2->getDrawRect().y2()); - _asRing1 = insertSprite(this, false, 258, 191, _class599->getDrawRect().y, false); - _asRing2 = insertSprite(this, false, 297, 189, _class599->getDrawRect().y, false); - _asRing3 = insertSprite(this, true, 370, 201, _class599->getDrawRect().y, getGlobalVar(V_FLYTRAP_RING_DOOR)); - _asRing4 = insertSprite(this, false, 334, 191, _class599->getDrawRect().y, false); - _asRing5 = insertSprite(this, false, 425, 184, _class599->getDrawRect().y, false); + _asRing1 = insertSprite(this, false, 258, 191, _ssCeiling->getDrawRect().y, false); + _asRing2 = insertSprite(this, false, 297, 189, _ssCeiling->getDrawRect().y, false); + _asRing3 = insertSprite(this, true, 370, 201, _ssCeiling->getDrawRect().y, getGlobalVar(V_FLYTRAP_RING_DOOR)); + _asRing4 = insertSprite(this, false, 334, 191, _ssCeiling->getDrawRect().y, false); + _asRing5 = insertSprite(this, false, 425, 184, _ssCeiling->getDrawRect().y, false); _asDoor = insertSprite(tempClipRect); tempSprite = insertSprite(); @@ -1374,11 +1374,11 @@ uint32 Scene1002::handleMessage(int messageNum, const MessageParam ¶m, Entit sendMessage(_asOutsideDoorBackground, 0x4808, 0); break; case 0x8000: - setSpriteSurfacePriority(_class599, 995); + setSpriteSurfacePriority(_ssCeiling, 995); setSpriteSurfacePriority(_ssLadderArch, 995); break; case 0x8001: - setSpriteSurfacePriority(_class599, 1015); + setSpriteSurfacePriority(_ssCeiling, 1015); setSpriteSurfacePriority(_ssLadderArch, 1015); break; } @@ -1566,9 +1566,8 @@ uint32 Scene1005::handleMessage(int messageNum, const MessageParam ¶m, Entit Scene::handleMessage(messageNum, param, sender); switch (messageNum) { case 0x0001: - if (param.asPoint().x <= 20 || param.asPoint().x >= 620) { + if (param.asPoint().x <= 20 || param.asPoint().x >= 620) leaveScene(0); - } break; } return 0; diff --git a/engines/neverhood/module1000.h b/engines/neverhood/module1000.h index 32228a20e7..2cc9a556dd 100644 --- a/engines/neverhood/module1000.h +++ b/engines/neverhood/module1000.h @@ -249,7 +249,7 @@ protected: Sprite *_ssLadderArchPart1; Sprite *_ssLadderArchPart2; Sprite *_ssLadderArchPart3; - Sprite *_class599; + Sprite *_ssCeiling; Sprite *_asKlaymanLadderHands; Sprite *_asKlaymanPeekHand; Sprite *_asOutsideDoorBackground; 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: diff --git a/engines/neverhood/smackerscene.h b/engines/neverhood/smackerscene.h index 54de28a720..7ed2e0262b 100644 --- a/engines/neverhood/smackerscene.h +++ b/engines/neverhood/smackerscene.h @@ -31,14 +31,14 @@ namespace Neverhood { class SmackerScene : public Scene { public: - SmackerScene(NeverhoodEngine *vm, Module *parentModule, bool doubleSurface, bool flag1, bool canAbort); + SmackerScene(NeverhoodEngine *vm, Module *parentModule, bool doubleSurface, bool canSkip, bool canAbort); virtual ~SmackerScene(); void setFileHash(uint32 fileHash); void setFileHashList(const uint32 *fileHashList); void nextVideo(); protected: bool _doubleSurface; - bool _flag1; + bool _canSkip; bool _canAbort; bool _videoPlayedBefore; bool _playNextVideoFlag; -- cgit v1.2.3