diff options
| author | Gregory Montoir | 2007-01-05 23:33:13 +0000 |
|---|---|---|
| committer | Gregory Montoir | 2007-01-05 23:33:13 +0000 |
| commit | cd79d127fadbdff767e59ffab0eff734efe7b23f (patch) | |
| tree | 1aadf442c8934a1b213696fe2ec8873353bb4ff1 | |
| parent | 2cc2b09e82ab2939df3b4cdefdfb17508d58d2d0 (diff) | |
| download | scummvm-rg350-cd79d127fadbdff767e59ffab0eff734efe7b23f.tar.gz scummvm-rg350-cd79d127fadbdff767e59ffab0eff734efe7b23f.tar.bz2 scummvm-rg350-cd79d127fadbdff767e59ffab0eff734efe7b23f.zip | |
Since Actor::initActor is now virtual, it shouldn't be called directly from the base constructor (ActorC64::initActor won't get called as vtable hasn't yet been setup).
svn-id: r25015
| -rw-r--r-- | engines/scumm/actor.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/scumm.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp index f8e46b335d..7b5db837e5 100644 --- a/engines/scumm/actor.cpp +++ b/engines/scumm/actor.cpp @@ -54,8 +54,6 @@ void Actor::initActorClass(ScummEngine *scumm) { Actor::Actor(int id) { assert(_vm != 0); _number = id; - - initActor(-1); } void Actor::initActor(int mode) { diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 7e43fbfeb0..981a48171f 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1242,6 +1242,7 @@ void ScummEngine::resetScumm() { _actors[i] = new ActorOldWalk(i); else _actors[i] = new Actor(i); + _actors[i]->initActor(-1); _actors[i]->initActor(1); // this is from IDB |