[Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.147,1.148 actor.h,1.34,1.35

Max Horn fingolfin at users.sourceforge.net
Sun Jul 27 16:46:18 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv17388a

Modified Files:
	actor.cpp actor.h 
Log Message:
init walkdata (fix for bug #770306); move Actor::Actor constructor from header to source file

Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- actor.cpp	27 Jul 2003 23:30:28 -0000	1.147
+++ actor.cpp	27 Jul 2003 23:45:43 -0000	1.148
@@ -44,6 +44,29 @@
 	}
 }
 
+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;

Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/actor.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- actor.h	24 Jul 2003 17:44:00 -0000	1.34
+++ actor.h	27 Jul 2003 23:45:43 -0000	1.35
@@ -121,27 +121,7 @@
 
 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();





More information about the Scummvm-git-logs mailing list