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/module1000.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/module1000.cpp')
| -rw-r--r-- | engines/neverhood/module1000.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/neverhood/module1000.cpp b/engines/neverhood/module1000.cpp index 8e6b56b9f0..4f8f584313 100644 --- a/engines/neverhood/module1000.cpp +++ b/engines/neverhood/module1000.cpp @@ -200,7 +200,7 @@ AsScene1001Hammer::AsScene1001Hammer(NeverhoodEngine *vm, Sprite *asDoor) _y = 206; createSurface(900, 177, 192); startAnimation(0x022C90D4, -1, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; SetUpdateHandler(&AnimatedSprite::update); SetMessageHandler(&AsScene1001Hammer::handleMessage); } @@ -218,7 +218,7 @@ uint32 AsScene1001Hammer::handleMessage(int messageNum, const MessageParam ¶ case 0x2000: startAnimation(0x022C90D4, 1, -1); playSound(0, 0xE741020A); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; break; } return 0; @@ -332,8 +332,6 @@ uint32 SsCommonButtonSprite::handleMessage(int messageNum, const MessageParam &p Scene1001::Scene1001(NeverhoodEngine *vm, Module *parentModule, int which) : Scene(vm, parentModule, true) { - _name = "Scene1001"; - Sprite *tempSprite; SetMessageHandler(&Scene1001::handleMessage); @@ -1130,7 +1128,7 @@ AsScene1002OutsideDoorBackground::AsScene1002OutsideDoorBackground(NeverhoodEngi _y = 240; if (getGlobalVar(V_FLYTRAP_RING_DOOR)) { startAnimation(0x004A4495, -1, -1); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; } else { setVisible(false); } @@ -1177,7 +1175,7 @@ uint32 AsScene1002OutsideDoorBackground::hmAnimation(int messageNum, const Messa void AsScene1002OutsideDoorBackground::stOpenDoor() { startAnimation(0x004A4495, 0, -1); SetMessageHandler(&AsScene1002OutsideDoorBackground::handleMessage); - _newStickFrameIndex = -2; + _newStickFrameIndex = STICK_LAST_FRAME; setVisible(true); } |