diff options
| author | Paul Gilbert | 2014-02-01 16:27:58 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-02-01 16:27:58 -0500 |
| commit | e1eddb5ecb541a9ea57734b379616e5fa61fe64b (patch) | |
| tree | e7e9ead32ea57d9fa43d24755005b182bd3808f4 | |
| parent | 10f9c2fb039a901b938229ca77eded3a3ef4fa75 (diff) | |
| download | scummvm-rg350-e1eddb5ecb541a9ea57734b379616e5fa61fe64b.tar.gz scummvm-rg350-e1eddb5ecb541a9ea57734b379616e5fa61fe64b.tar.bz2 scummvm-rg350-e1eddb5ecb541a9ea57734b379616e5fa61fe64b.zip | |
VOYEUR: Initialization bugfixes
| -rw-r--r-- | engines/voyeur/data.h | 8 | ||||
| -rw-r--r-- | engines/voyeur/graphics.cpp | 2 | ||||
| -rw-r--r-- | engines/voyeur/voyeur.cpp | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/engines/voyeur/data.h b/engines/voyeur/data.h index b798e3880c..b243b15682 100644 --- a/engines/voyeur/data.h +++ b/engines/voyeur/data.h @@ -67,8 +67,12 @@ public: * Resets the data to an initial state */ void reset() { - Common::fill(&_min[0][0], &_min[SLOTS][20], 9999); - Common::fill(&_max[0][0], &_max[SLOTS][20], 0); + for (int hotspotIdx = 0; hotspotIdx < 20; ++hotspotIdx) { + for (int slotIdx = 0; slotIdx < SLOTS; ++slotIdx) { + _min[slotIdx][hotspotIdx] = 9999; + _max[slotIdx][hotspotIdx] = 0; + } + } } /** diff --git a/engines/voyeur/graphics.cpp b/engines/voyeur/graphics.cpp index 387be4e499..11a8ef54e6 100644 --- a/engines/voyeur/graphics.cpp +++ b/engines/voyeur/graphics.cpp @@ -996,7 +996,7 @@ void GraphicsManager::screenReset() { resetPalette(); _backgroundPage = NULL; - (*_vPort)->setupViewPort(); + (*_vPort)->setupViewPort(NULL); fillPic(*_vPort, 0); _vm->flipPageAndWait(); diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp index 2898c16592..8e597bbea9 100644 --- a/engines/voyeur/voyeur.cpp +++ b/engines/voyeur/voyeur.cpp @@ -633,7 +633,7 @@ void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::St _eventsManager._intPtr.field38 = true; _eventsManager._intPtr._hasPalette = true; - (*_graphicsManager._vPort)->setupViewPort(); + (*_graphicsManager._vPort)->setupViewPort(NULL); (*_graphicsManager._vPort)->fillPic(128); _graphicsManager.flipPage(); _eventsManager.sWaitFlip(); |