PINK: add proper implementation of Actor init function

scummvm · Jun 28, 2018 · f7693d3 · f7693d3
1 parent 44efa90
commit f7693d3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/engines/pink/objects/actors/actor.cpp b/engines/pink/objects/actors/actor.cpp
@@ -58,15 +58,16 @@ void Actor::saveState(Archive &archive) {
 	archive.writeString(actionName);
 }
 
-void Actor::init(bool unk) {
+void Actor::init(bool paused) {
 	if (!_action)
 		_action = findAction(kIdleAction);
 
 	if (!_action) {
 		_isActionEnded = 1;
 	} else {
 		_isActionEnded = 0;
-		_action->start(unk);
+		_action->start();
+		_action->pause(paused);
 	}
 }
 
@@ -168,7 +169,7 @@ void Actor::setAction(Action *newAction) {
 	_action = newAction;
 	if (newAction) {
 		_isActionEnded = 0;
-		_action->start(0);
+		_action->start();
 	}
 }
 

diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h
@@ -47,7 +47,7 @@ class Actor : public NamedObject {
 	void loadState(Archive &archive);
 	void saveState(Archive &archive);
 
-	virtual void init(bool unk);
+	virtual void init(bool paused);
 	bool initPallete(Director *director);
 
 	void toConsole() override ;

diff --git a/engines/pink/objects/handlers/handler_timer.cpp b/engines/pink/objects/handlers/handler_timer.cpp
@@ -65,7 +65,7 @@ void HandlerTimerActions::handle(Actor *actor) {
 		uint index = rnd.getRandomNumber(_actions.size() - 1);
 		Action *action = actor->findAction(_actions[index]);
 		assert(action);
-		actor->setAction(action, 0);
+		actor->setAction(action);
 	}
 }
 

diff --git a/engines/pink/objects/walk/walk_mgr.cpp b/engines/pink/objects/walk/walk_mgr.cpp
@@ -71,7 +71,7 @@ void WalkMgr::start(WalkLocation *destination) {
 		WalkShortestPath path(this);
 		WalkLocation *nextLocation = path.next(currentLocation, _destination);
 		initNextWayPoint(nextLocation);
-		_leadActor->setAction(getWalkAction(), 0);
+		_leadActor->setAction(getWalkAction());
 	}
 }
 
@@ -106,7 +106,7 @@ WalkMgr::Coordinates WalkMgr::getLocationCoordinates(const Common::String &locat
 	Coordinates coords;
 	ActionCEL *action  = static_cast<ActionCEL*>(_leadActor->findAction(locationName));
 
-	action->start(0);
+	action->start();
 	CelDecoder *decoder = action->getDecoder();
 
 	coords.x = decoder->getX() + decoder->getWidth() / 2;
@@ -132,7 +132,7 @@ void WalkMgr::update() {
 	WalkLocation *next = path.next(findLocation(_current.name), _destination);
 	if (next) {
 		initNextWayPoint(next);
-		_leadActor->setAction(getWalkAction(), 0);
+		_leadActor->setAction(getWalkAction());
 	} else
 		end();