aboutsummaryrefslogtreecommitdiff
path: root/scumm/scummvm.cpp
diff options
context:
space:
mode:
authorMax Horn2002-12-23 23:30:14 +0000
committerMax Horn2002-12-23 23:30:14 +0000
commit6585425c890bcb65beb399d6fe5d07b1257cb904 (patch)
tree149961523c5a5d06e6cc8848800bdf1660db7b7c /scumm/scummvm.cpp
parent4c8c6ff84e31ce7b920bb60d4d79619fcc01d9c4 (diff)
downloadscummvm-rg350-6585425c890bcb65beb399d6fe5d07b1257cb904.tar.gz
scummvm-rg350-6585425c890bcb65beb399d6fe5d07b1257cb904.tar.bz2
scummvm-rg350-6585425c890bcb65beb399d6fe5d07b1257cb904.zip
set NUM_ACTORS to 80 for COMI; get rid of MAX_ACTORS (use NUM_ACTORS instead); some updates
svn-id: r6086
Diffstat (limited to 'scumm/scummvm.cpp')
-rw-r--r--scumm/scummvm.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 05fd844f86..f782041223 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -227,7 +227,7 @@ void Scumm::scummInit()
setupCursor();
/* Allocate and initilise actors */
- _actors = new Actor[MAX_ACTORS];
+ _actors = new Actor[NUM_ACTORS];
for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
a->number = i;
a->initActorClass(this);
@@ -1533,7 +1533,9 @@ void Scumm::launch()
setupScummVars();
- if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX))
+ if (_features & GF_AFTER_V8)
+ NUM_ACTORS = 80;
+ else if ((_features & GF_AFTER_V7) || (_gameId == GID_SAMNMAX))
NUM_ACTORS = 30;
else
NUM_ACTORS = 13;