aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2005-03-09 05:04:14 +0000
committerTravis Howell2005-03-09 05:04:14 +0000
commitebcf64df5619121684a021b6b53900968d097471 (patch)
treee0eb87ea57b18e3e3231823305651e5d40779662 /scumm
parent69a39e3c54b2433ca39517a34f43d3c4473ad81d (diff)
downloadscummvm-rg350-ebcf64df5619121684a021b6b53900968d097471.tar.gz
scummvm-rg350-ebcf64df5619121684a021b6b53900968d097471.tar.bz2
scummvm-rg350-ebcf64df5619121684a021b6b53900968d097471.zip
_imagesNum should be clear in startScene()
svn-id: r17044
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.cpp5
-rw-r--r--scumm/wiz_he.cpp4
-rw-r--r--scumm/wiz_he.h1
3 files changed, 8 insertions, 2 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index d43e27a725..a7e40493d5 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2038,9 +2038,10 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
stopCycle(0);
_sound->processSoundQues();
- if (_heversion >= 71) {
+ if (_heversion >= 71)
((ScummEngine_v70he *)this)->_wiz.polygonClear();
- }
+ if (_heversion >= 72)
+ ((ScummEngine_v72he *)this)->_wiz.imageNumClear();
// For HE80+ games
for (i = 0; i < _numRoomVariables; i++)
diff --git a/scumm/wiz_he.cpp b/scumm/wiz_he.cpp
index de3d2390d4..8ceb4fccce 100644
--- a/scumm/wiz_he.cpp
+++ b/scumm/wiz_he.cpp
@@ -35,6 +35,10 @@ Wiz::Wiz() {
memset(&_polygons, 0, sizeof(_polygons));
}
+void Wiz::imageNumClear() {
+ _imagesNum = 0;
+}
+
void Wiz::polygonClear() {
memset(&_polygons, 0, sizeof(_polygons));
}
diff --git a/scumm/wiz_he.h b/scumm/wiz_he.h
index e6aa58f745..dceb398397 100644
--- a/scumm/wiz_he.h
+++ b/scumm/wiz_he.h
@@ -109,6 +109,7 @@ struct Wiz {
WizPolygon _polygons[NUM_POLYGONS];
Wiz();
+ void imageNumClear();
void polygonClear();
void polygonLoad(const uint8 *polData);