From cd79d127fadbdff767e59ffab0eff734efe7b23f Mon Sep 17 00:00:00 2001
From: Gregory Montoir <cyx@scummvm.org>
Date: Fri, 5 Jan 2007 23:33:13 +0000
Subject: [PATCH] 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
---
 engines/scumm/actor.cpp | 2 --
 engines/scumm/scumm.cpp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index f8e46b335d2..7b5db837e5f 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 7e43fbfeb01..981a48171f9 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