diff options
author | johndoe123 | 2012-10-18 17:36:40 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:47:32 +0200 |
commit | 126a306c899924cf774dfc0db1111728f9ac366b (patch) | |
tree | 93767933eec016dbcb6aab981e9e9ab26cbf5570 /engines/neverhood/module1200.cpp | |
parent | 533eb5d61d6d3f0b7f229648cf186ba1b54e5388 (diff) | |
download | scummvm-rg350-126a306c899924cf774dfc0db1111728f9ac366b.tar.gz scummvm-rg350-126a306c899924cf774dfc0db1111728f9ac366b.tar.bz2 scummvm-rg350-126a306c899924cf774dfc0db1111728f9ac366b.zip |
NEVERHOOD: Some cleanup:
- Remove _name field from Entity (wasn't really maintained by me and
became useless)
- Remove obsolete TODOs
- Add STICK_LAST_FRAME constant for better readability
- Remove commented out callbackList TODOs (these were so far never
used with over 90% of the game implemented)
Diffstat (limited to 'engines/neverhood/module1200.cpp')
-rw-r--r-- | engines/neverhood/module1200.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/neverhood/module1200.cpp b/engines/neverhood/module1200.cpp index c0bab71f52..768e7819b0 100644 --- a/engines/neverhood/module1200.cpp +++ b/engines/neverhood/module1200.cpp @@ -229,7 +229,7 @@ AsScene1201TntManRope::AsScene1201TntManRope(NeverhoodEngine *vm, bool flag) _y = -32; if (flag) { startAnimation(0x928F0C10, 15, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; } else { startAnimation(0x928F0C10, 0, -1); _newStickFrameIndex = 0; @@ -246,7 +246,7 @@ uint32 AsScene1201TntManRope::handleMessage(int messageNum, const MessageParam & break; case 0x2006: startAnimation(0x928F0C10, 1, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; break; } return messageResult; @@ -260,10 +260,10 @@ AsScene1201RightDoor::AsScene1201RightDoor(NeverhoodEngine *vm, Sprite *klayman, _y = 240; SetUpdateHandler(&AsScene1201RightDoor::update); SetMessageHandler(&AsScene1201RightDoor::handleMessage); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; if (flag) { startAnimation(0xD088AC30, -1, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; _countdown = 25; } else { stopAnimation(); @@ -293,7 +293,7 @@ uint32 AsScene1201RightDoor::handleMessage(int messageNum, const MessageParam &p void AsScene1201RightDoor::stOpenDoor() { startAnimation(0xD088AC30, 0, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; setVisible(true); playSound(0, calcHash("fxDoorOpen20")); } @@ -419,7 +419,7 @@ void AsScene1201TntMan::stMoving() { startAnimation(0x85084190, 0, -1); SetMessageHandler(&AsScene1201TntMan::handleMessage); SetSpriteUpdate(&AsScene1201TntMan::suMoving); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; } AsScene1201TntManFlame::AsScene1201TntManFlame(NeverhoodEngine *vm, Sprite *asTntMan) @@ -687,11 +687,11 @@ AsScene1201LeftDoor::AsScene1201LeftDoor(NeverhoodEngine *vm, Sprite *klayman) createSurface(800, 55, 199); if (_klayman->getX() < 100) { startAnimation(0x508A111B, 0, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; playSound(0, calcHash("fxDoorOpen03")); } else { startAnimation(0x508A111B, -1, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; } SetUpdateHandler(&AnimatedSprite::update); SetMessageHandler(&AsScene1201LeftDoor::handleMessage); |