diff options
author | johndoe123 | 2013-03-02 21:25:38 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:47:43 +0200 |
commit | 583f9abaf98f64895546b75573e9442ca47426e3 (patch) | |
tree | 81b2cb6521b700fa767ad14bcb891a1f16b5fe6d /engines/neverhood/module1400.cpp | |
parent | 9b6d813d412a636b1c02511065ab1466e0f6c5e0 (diff) | |
download | scummvm-rg350-583f9abaf98f64895546b75573e9442ca47426e3.tar.gz scummvm-rg350-583f9abaf98f64895546b75573e9442ca47426e3.tar.bz2 scummvm-rg350-583f9abaf98f64895546b75573e9442ca47426e3.zip |
NEVERHOOD: Fix some logic bugs and minor changes
- Fix video speed in the very last scene (Scene1317)
- Fix back door not opening in Scene1401
- Fix projector not moving in Scene1402
- Fix projector not appearing in Scene1403
- Fix wrong Klaymen walking in Scene2205
- Fix wrong scene change in Module2300
- Fix symbols not appearing in Scene3011
- Define out some remaining logic debug code
- Remove some obsolete comments
- Reduce debug output
- Use a List instead of an Array when building the microtiles rectangles
Diffstat (limited to 'engines/neverhood/module1400.cpp')
-rw-r--r-- | engines/neverhood/module1400.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/neverhood/module1400.cpp b/engines/neverhood/module1400.cpp index d96703b6f2..8aa0632e90 100644 --- a/engines/neverhood/module1400.cpp +++ b/engines/neverhood/module1400.cpp @@ -339,7 +339,7 @@ uint32 AsScene1401BackDoor::handleMessage(int messageNum, const MessageParam &pa break; case 0x4808: _countdown = 168; - if (_isOpen) + if (!_isOpen) stOpenDoor(); break; } @@ -743,7 +743,7 @@ uint32 Scene1401::handleMessage(int messageNum, const MessageParam ¶m, Entit if (_asProjector && _asProjector->getX() > 404 && _asProjector->getX() < 504) sendMessage(_asProjector , 0x4839, 0); } else if (sender == _ssButton) - sendMessage(_ssButton, 0x4808, 0); + sendMessage(_asBackDoor, 0x4808, 0); break; case 0x4826: if (sender == _asProjector) { @@ -968,7 +968,7 @@ uint32 Scene1402::handleMessage(int messageNum, const MessageParam ¶m, Entit break; case 0x4826: if (sender == _asProjector) { - if (sendMessage(_asProjector, 0x408C, _klaymen->getX() > _asProjector->getX() ? 1 : 0) != 0) { + if (sendMessage(_asProjector, 0x480C, _klaymen->getX() > _asProjector->getX() ? 1 : 0) != 0) { sendEntityMessage(_klaymen, 0x1014, _asProjector); setMessageList2(0x004B0BB8); } else @@ -1309,7 +1309,7 @@ Scene1403::Scene1403(NeverhoodEngine *vm, Module *parentModule, int which) } _klaymen->setRepl(64, 0); - if (getGlobalVar(V_PROJECTOR_LOCATION) == 4) { + if (getGlobalVar(V_PROJECTOR_LOCATION) == 0) { _asProjector = insertSprite<AsCommonProjector>(this, _klaymen, (Sprite*)NULL); addCollisionSprite(_asProjector); if (getGlobalVar(V_PROJECTOR_SLOT) == 4) { |