thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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).

Browse source 
svn-id: r25015
This commit is contained in:
Gregory Montoir 2007-01-05 23:33:13 +00:00
parent 2cc2b09e82
commit cd79d127fa
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/scumm/actor.cpp
View file

@ -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) {

1
engines/scumm/scumm.cpp
View file

@ -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