init walkdata (fix for bug #770306); move Actor::Actor constructor from header to source file

svn-id: r9205

2 files changed, 24 insertions, 21 deletions

diff --git a/scumm/actor.cpp b/scumm/actor.cpp
index 2b0cd5d0ab..94dd4c0d1a 100644
--- a/scumm/actor.cpp
+++ b/scumm/actor.cpp
@@ -44,6 +44,29 @@ void Actor::initActorClass(Scumm *scumm) {
 	}
 }
 
+Actor::Actor() {
+	assert(_vm != 0);
+	top = bottom = 0;
+	number = 0;
+	needRedraw = needBgReset = costumeNeedsInit = visible = false;
+	flip = false;
+	speedx = 8;
+	speedy = 2;
+	frame = 0;
+	walkbox = 0;
+	animProgress = 0;
+	memset(animVariable, 0, sizeof(animVariable));
+	memset(palette, 0, sizeof(palette));
+	memset(sound, 0, sizeof(sound));
+	memset(&cost, 0, sizeof(CostumeData));
+	memset(&walkdata, 0, sizeof(ActorWalkData));
+	walkdata.point3x = 32000;
+
+	walkScript = 0;
+
+	initActor(1);
+}
+
 void Actor::initActor(int mode) {
 	if (mode == 1) {
 		costume = 0;
diff --git a/scumm/actor.h b/scumm/actor.h
index 5748f557ee..a4d8f0466a 100644
--- a/scumm/actor.h
+++ b/scumm/actor.h
@@ -121,27 +121,7 @@ protected:
 
 public:
 
-	// Constructor, sets all data to 0
-	Actor() {
-		assert(_vm != 0);
-		top = bottom = 0;
-		number = 0;
-		needRedraw = needBgReset = costumeNeedsInit = visible = false;
-		flip = false;
-		speedx = 8;
-		speedy = 2;
-		frame = 0;
-		walkbox = 0;
-		animProgress = 0;
-		memset(animVariable, 0, sizeof(animVariable));
-		memset(palette, 0, sizeof(palette));
-		memset(sound, 0, sizeof(sound));
-		memset(&cost, 0, sizeof(CostumeData));
-
-		walkScript = 0;
-
-		initActor(1);
-	}
+	Actor();
 	
 //protected:
 	void hideActor();