diff options
| author | Max Horn | 2007-03-12 12:11:59 +0000 |
|---|---|---|
| committer | Max Horn | 2007-03-12 12:11:59 +0000 |
| commit | f47670f5a38a3e32a56e94c9a67084cdeff87d48 (patch) | |
| tree | ce594af561947ae31f6a214023d9cb0bb1c83ad2 /engines/scumm/scumm.cpp | |
| parent | f1984bdeaed94e607b069a16567ba4b82c4319b1 (diff) | |
| download | scummvm-rg350-f47670f5a38a3e32a56e94c9a67084cdeff87d48.tar.gz scummvm-rg350-f47670f5a38a3e32a56e94c9a67084cdeff87d48.tar.bz2 scummvm-rg350-f47670f5a38a3e32a56e94c9a67084cdeff87d48.zip | |
Get rid of initActorClass
svn-id: r26101
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index b808ccb061..267b78d1f7 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1295,18 +1295,18 @@ void ScummEngine::resetScumm() { _cursor.animate = 1; // Allocate and Initialize actors - Actor::initActorClass(this); + Actor::kInvalidBox = ((_game.features & GF_SMALL_HEADER) ? kOldInvalidBox : kNewInavlidBox); _actors = new Actor * [_numActors]; _sortedActors = new Actor * [_numActors]; for (i = 0; i < _numActors; ++i) { if (_game.version == 0) - _actors[i] = new ActorC64(i); + _actors[i] = new ActorC64(this, i); else if (_game.version <= 2) - _actors[i] = new Actor_v2(i); + _actors[i] = new Actor_v2(this, i); else if (_game.version == 3) - _actors[i] = new Actor_v3(i); + _actors[i] = new Actor_v3(this, i); else - _actors[i] = new Actor(i); + _actors[i] = new Actor(this, i); _actors[i]->initActor(-1); // this is from IDB |