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/smackerplayer.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/smackerplayer.cpp')
-rw-r--r-- | engines/neverhood/smackerplayer.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/engines/neverhood/smackerplayer.cpp b/engines/neverhood/smackerplayer.cpp index d7a244ba94..04959b42b0 100644 --- a/engines/neverhood/smackerplayer.cpp +++ b/engines/neverhood/smackerplayer.cpp @@ -44,7 +44,6 @@ void SmackerSurface::setSmackerFrame(const Graphics::Surface *smackerFrame) { _drawRect.y = 0; _drawRect.width = smackerFrame->w; _drawRect.height = smackerFrame->h; - // TODO: Check if _sysRect is needed at all in the reimplementation... _sysRect.x = 0; _sysRect.y = 0; _sysRect.width = (smackerFrame->w + 3) & 0xFFFC; // align by 4 bytes @@ -66,7 +65,7 @@ void SmackerDoubleSurface::draw() { // SmackerPlayer SmackerPlayer::SmackerPlayer(NeverhoodEngine *vm, Scene *scene, uint32 fileHash, bool doubleSurface, bool flag, bool paused) - : Entity(vm, 0), _scene(scene), _doubleSurface(doubleSurface), _dirtyFlag(false), _videoDone(false), _paused(paused), + : Entity(vm, 0), _scene(scene), _doubleSurface(doubleSurface), _videoDone(false), _paused(paused), _palette(NULL), _smackerDecoder(NULL), _smackerSurface(NULL), _stream(NULL), _smackerFirst(true), _drawX(-1), _drawY(-1) { @@ -96,8 +95,6 @@ void SmackerPlayer::open(uint32 fileHash, bool keepLastFrame) { _stream = _vm->_res->createStream(fileHash); - // TODO: _keepLastFrame stuff - _smackerDecoder = new Video::SmackerDecoder(); _smackerDecoder->loadStream(_stream); @@ -164,11 +161,6 @@ void SmackerPlayer::update() { if (!_smackerDecoder) return; - if (_dirtyFlag) { - // TODO _vm->_screen->resetDirtyRects(); - _dirtyFlag = false; - } - if (_paused) { if (_smackerFirst) updateFrame(); @@ -208,13 +200,6 @@ void SmackerPlayer::updateFrame() { _smackerFirst = false; } - if (_doubleSurface) { - // TODO - } - - // TODO _vm->_screen->_skipUpdate = true; - _dirtyFlag = true; - if (_smackerDecoder->hasDirtyPalette()) updatePalette(); |