diff options
author | johndoe123 | 2012-11-14 12:21:13 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2013-05-08 20:47:37 +0200 |
commit | 1904e944c561a21dbe6271f64393f2bfc5f584f9 (patch) | |
tree | 03fb80bb0c1b10f5095c863c9219dd9c981983ea /engines/neverhood/sprite.cpp | |
parent | 685ce4e3122dfd48ce136f6bc6baaacf142e8850 (diff) | |
download | scummvm-rg350-1904e944c561a21dbe6271f64393f2bfc5f584f9.tar.gz scummvm-rg350-1904e944c561a21dbe6271f64393f2bfc5f584f9.tar.bz2 scummvm-rg350-1904e944c561a21dbe6271f64393f2bfc5f584f9.zip |
NEVERHOOD: Add initCubeSymbolsPuzzle
- Add microtiles to the screen update to eliminate overdraw
(microtiles code taken from the Toltecs engine)
- Fix sprite dimensions in AsScene1402PuzzleBox which caused a crash
- Fix screen shaking in Scene1402
(the puzzle box and bridge parts now shake along :)
- Use addSoundItem/addMusicItem in the SoundMan instead of
directly using push_back on the resp. arrays
- Remove old code and comments
Diffstat (limited to 'engines/neverhood/sprite.cpp')
-rw-r--r-- | engines/neverhood/sprite.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/engines/neverhood/sprite.cpp b/engines/neverhood/sprite.cpp index d034783b03..1e73078a1b 100644 --- a/engines/neverhood/sprite.cpp +++ b/engines/neverhood/sprite.cpp @@ -21,6 +21,7 @@ */ #include "neverhood/sprite.h" +#include "neverhood/screen.h" namespace Neverhood { @@ -74,13 +75,6 @@ bool Sprite::checkCollision(NRect &rect) { } uint32 Sprite::handleMessage(int messageNum, const MessageParam ¶m, Entity *sender) { - switch (messageNum) { - case 0x0005: - // TODO: Draw debug marker (?) - // TODO g_Screen->drawLine(_x - 5, _y, _x + 6, _y); - // TODO g_Screen->drawLine(_x, _y - 5, _x, _y + 6); - break; - } return 0; } @@ -93,8 +87,7 @@ void Sprite::createSurface(int surfacePriority, int16 width, int16 height) { } int16 Sprite::defFilterY(int16 y) { - // TODO return y - g_screen->field_26; - return y; + return y - _vm->_screen->getYOffset(); } void Sprite::setClipRect(int16 x1, int16 y1, int16 x2, int16 y2) { |