PINK: fix shadowing declarations

scummvm · Jun 28, 2018 · 28a1ff7 · 28a1ff7
1 parent 25a9e09
commit 28a1ff7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/engines/pink/objects/sequences/sequence_context.cpp b/engines/pink/objects/sequences/sequence_context.cpp
@@ -32,9 +32,9 @@
 namespace Pink {
 
 void SequenceActorState::execute(uint segment, Sequence *sequence, bool loadingSave) const {
-	Actor *actor = sequence->getSequencer()->getPage()->findActor(this->actor);
-	if (actor && this->segment != segment && !defaultAction.empty()) {
-		Action *action = actor->findAction(defaultAction);
+	Actor *actor = sequence->getSequencer()->getPage()->findActor(this->actorName);
+	if (actor && _segment != segment && !defaultActionName.empty()) {
+		Action *action = actor->findAction(defaultActionName);
 		if (action && actor->getAction() != action) {
 			actor->setAction(action, loadingSave);
 		}
@@ -52,7 +52,7 @@ SequenceContext::SequenceContext(Sequence *sequence)
 	for (uint i = 0; i < items.size(); ++i) {
 		bool found = 0;
 		for (uint j = 0; j < _states.size(); ++j) {
-			if (items[i]->getActor() == _states[j].actor) {
+			if (items[i]->getActor() == _states[j].actorName) {
 				found = 1;
 				break;
 			}
@@ -76,21 +76,21 @@ void SequenceContext::execute(uint nextItemIndex, bool loadingSave) {
 
 void SequenceContext::clearDefaultActions() {
 	for (uint i = 0; i < _states.size(); ++i) {
-		_states[i].defaultAction.clear();
+		_states[i].defaultActionName.clear();
 	}
 }
 
 SequenceActorState *SequenceContext::findState(const Common::String &actor) {
 	for (uint i = 0; i < _states.size(); ++i) {
-		if (_states[i].actor == actor)
+		if (_states[i].actorName == actor)
 			return &_states[i];
 	}
 	return nullptr;
 }
 
 bool SequenceContext::isConflictsWith(SequenceContext *context) {
 	for (uint i = 0; i < _states.size(); ++i) {
-		if (context->findState(_states[i].actor))
+		if (context->findState(_states[i].actorName))
 			return true;
 	}
 	return false;

diff --git a/engines/pink/objects/sequences/sequence_context.h b/engines/pink/objects/sequences/sequence_context.h
@@ -31,14 +31,14 @@ class Sequence;
 class Sequencer;
 
 struct SequenceActorState {
-	SequenceActorState(const Common::String actorName)
-			: actor(actorName), segment(0) {}
+	SequenceActorState(const Common::String actor)
+			: actorName(actor), _segment(0) {}
 
 	void execute(uint segment, Sequence *sequence, bool loadingSave) const;
 
-	Common::String actor;
-	Common::String defaultAction;
-	uint segment;
+	Common::String actorName;
+	Common::String defaultActionName;
+	uint _segment;
 };
 
 class Actor;

diff --git a/engines/pink/objects/sequences/sequence_item.cpp b/engines/pink/objects/sequences/sequence_item.cpp
@@ -53,7 +53,7 @@ bool SequenceItem::execute(uint segment, Sequence *sequence, bool loadingSave) {
 	SequenceContext *context = sequence->getContext();
 	SequenceActorState *state = context->findState(_actor);
 	if (state)
-		state->segment = segment;
+		state->_segment = segment;
 	if (isLeader())
 		context->setActor(actor);
 	return true;
@@ -84,7 +84,7 @@ void SequenceItemLeaderAudio::toConsole() {
 bool SequenceItemDefaultAction::execute(uint segment, Sequence *sequence, bool loadingSave) {
 	SequenceActorState *state = sequence->getContext()->findState(_actor);
 	if (state)
-		state->defaultAction = _action;
+		state->defaultActionName = _action;
 	return true;
 }