[Scummvm-cvs-logs] SF.net SVN: scummvm: [25015] scummvm/trunk/engines/scumm

[cyx at users.sourceforge.net]

Revision: 25015
          http://scummvm.svn.sourceforge.net/scummvm/?rev=25015&view=rev
Author:   cyx
Date:     2007-01-05 15:33:13 -0800 (Fri, 05 Jan 2007)

Log Message:
-----------
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).

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/actor.cpp
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/actor.cpp
===================================================================
--- scummvm/trunk/engines/scumm/actor.cpp	2007-01-05 23:09:18 UTC (rev 25014)
+++ scummvm/trunk/engines/scumm/actor.cpp	2007-01-05 23:33:13 UTC (rev 25015)
@@ -54,8 +54,6 @@
 Actor::Actor(int id) {
 	assert(_vm != 0);
 	_number = id;
-
-	initActor(-1);
 }
 
 void Actor::initActor(int mode) {

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2007-01-05 23:09:18 UTC (rev 25014)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2007-01-05 23:33:13 UTC (rev 25015)
@@ -1242,6 +1242,7 @@
 			_actors[i] = new ActorOldWalk(i);
 		else
 			_actors[i] = new Actor(i);
+		_actors[i]->initActor(-1);
 		_actors[i]->initActor(1);
 
 		// this is from IDB


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.