aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/pink/objects/sequences/sequence_context.cpp2
-rw-r--r--engines/pink/objects/sequences/sequence_context.h2
-rw-r--r--engines/pink/objects/sequences/sequencer.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/pink/objects/sequences/sequence_context.cpp b/engines/pink/objects/sequences/sequence_context.cpp
index d10bf23cba..962aeb2814 100644
--- a/engines/pink/objects/sequences/sequence_context.cpp
+++ b/engines/pink/objects/sequences/sequence_context.cpp
@@ -87,7 +87,7 @@ SequenceActorState *SequenceContext::findState(const Common::String &actor) {
return nullptr;
}
-bool SequenceContext::isConflictsWith(SequenceContext *context) {
+bool SequenceContext::isConflictingWith(SequenceContext *context) {
for (uint i = 0; i < _states.size(); ++i) {
if (context->findState(_states[i].actorName))
return true;
diff --git a/engines/pink/objects/sequences/sequence_context.h b/engines/pink/objects/sequences/sequence_context.h
index ccca20e686..eea87afa94 100644
--- a/engines/pink/objects/sequences/sequence_context.h
+++ b/engines/pink/objects/sequences/sequence_context.h
@@ -49,7 +49,7 @@ public:
void execute(uint nextItemIndex, bool loadingSave);
- bool isConflictsWith(SequenceContext *context);
+ bool isConflictingWith(SequenceContext *context);
void clearDefaultActions();
diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp
index 6b59788a43..f76ed66ab4 100644
--- a/engines/pink/objects/sequences/sequencer.cpp
+++ b/engines/pink/objects/sequences/sequencer.cpp
@@ -180,11 +180,11 @@ void Sequencer::saveState(Archive &archive) {
}
SequenceContext *Sequencer::findConfilictingContextWith(SequenceContext *context) {
- if (_context && _context->isConflictsWith(context)) {
+ if (_context && _context->isConflictingWith(context)) {
return _context;
}
for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- if (_parrallelContexts[i]->isConflictsWith(context))
+ if (_parrallelContexts[i]->isConflictingWith(context))
return _parrallelContexts[i];
}
return nullptr;