aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorTravis Howell2004-09-10 02:03:31 +0000
committerTravis Howell2004-09-10 02:03:31 +0000
commit0a3ca185e095348d3d0e240f1e815849b346e3ec (patch)
treedc4b4f60b0388a46e5bf69d8a4bdb6cc296b6dc6 /scumm
parent67f7c40446bf28ce28401ef2e97bf4dd2f334a95 (diff)
downloadscummvm-rg350-0a3ca185e095348d3d0e240f1e815849b346e3ec.tar.gz
scummvm-rg350-0a3ca185e095348d3d0e240f1e815849b346e3ec.tar.bz2
scummvm-rg350-0a3ca185e095348d3d0e240f1e815849b346e3ec.zip
Check _scummVar size of restart too.
svn-id: r14987
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 1128d7cac0..857bef92dc 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -2302,10 +2302,8 @@ void ScummEngine::startScene(int room, Actor *a, int objectNr) {
_sound->processSoundQues();
// Clear the room variables
- if (_heversion >= 80) {
- for (i = 0; i < _numRoomVariables; i++)
- _roomVars[i] = 0;
- }
+ for (i = 0; i < _numRoomVariables; i++)
+ _roomVars[i] = 0;
for (i = 1; i < _numActors; i++) {
_actors[i].hideActor();
@@ -2820,7 +2818,7 @@ void ScummEngine::restart() {
_sound->stopAllSounds();
// Clear the script variables
- for (i = 0; i < 255; i++)
+ for (i = 0; i < _numVariables; i++)
_scummVars[i] = 0;
// Empty inventory