diff options
| author | Paul Gilbert | 2015-05-16 09:29:40 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2015-05-16 09:29:40 -0400 |
| commit | af651e19a421781a1498de0e66909a2e9450611c (patch) | |
| tree | ee5991b696600dd4fe03338b04a684a605215a7c /engines/sherlock/screen.cpp | |
| parent | 32d7690e549f5af8fb5f88d9434ae0f54c0e6c69 (diff) | |
| parent | 96e929f5233b23917169c7d0121e9c1e264455c1 (diff) | |
| download | scummvm-rg350-af651e19a421781a1498de0e66909a2e9450611c.tar.gz scummvm-rg350-af651e19a421781a1498de0e66909a2e9450611c.tar.bz2 scummvm-rg350-af651e19a421781a1498de0e66909a2e9450611c.zip | |
Merge branch 'sherlock' into sherlock2
Conflicts:
engines/sherlock/decompress.cpp
engines/sherlock/objects.cpp
engines/sherlock/objects.h
engines/sherlock/scene.cpp
engines/sherlock/scene.h
engines/sherlock/sound.cpp
Diffstat (limited to 'engines/sherlock/screen.cpp')
| -rw-r--r-- | engines/sherlock/screen.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp index 0ca10b4a4a..349bf4d024 100644 --- a/engines/sherlock/screen.cpp +++ b/engines/sherlock/screen.cpp @@ -149,6 +149,7 @@ void Screen::fadeToBlack(int speed) { } setPalette(tempPalette); + fillRect(Common::Rect(0, 0, this->w, this->h), 0); } /** @@ -169,7 +170,7 @@ void Screen::fadeIn(const byte palette[PALETTE_SIZE], int speed) { */ void Screen::addDirtyRect(const Common::Rect &r) { _dirtyRects.push_back(r); - assert(r.isValidRect() && r.width() > 0 && r.height() > 0); + assert(r.width() > 0 && r.height() > 0); } /** @@ -224,7 +225,7 @@ void Screen::randomTransition() { if (offset < (this->w * this->h)) *((byte *)getPixels() + offset) = *((const byte *)_backBuffer->getPixels() + offset); - if (idx != 0 && (idx % 100) == 0) { + if (idx != 0 && (idx % 300) == 0) { // Ensure there's a full screen dirty rect for the next frame update if (_dirtyRects.empty()) addDirtyRect(Common::Rect(0, 0, this->w, this->h)); |