[Scummvm-git-logs] scummvm master -> c6450e49ce6ac28388192790948ad14401b495d6
whiterandrek
whiterandrek at gmail.com
Thu Jun 4 18:23:01 UTC 2020
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
632a181a81 PINK: removed unused method
cedf844ae4 PINK: JANITORIAL: fixed typo
0d18e0757f PINK: JANITORIAL: fixed typo
c6450e49ce PINK: pass string by reference in SequenceActorState ctor
Commit: 632a181a8135ed278d9b9f1efca2c9bb1c1b88f8
https://github.com/scummvm/scummvm/commit/632a181a8135ed278d9b9f1efca2c9bb1c1b88f8
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T20:57:13+03:00
Commit Message:
PINK: removed unused method
Changed paths:
engines/pink/objects/actors/actor.h
diff --git a/engines/pink/objects/actors/actor.h b/engines/pink/objects/actors/actor.h
index bbd50f8a6e..278bfdd9af 100644
--- a/engines/pink/objects/actors/actor.h
+++ b/engines/pink/objects/actors/actor.h
@@ -87,8 +87,6 @@ public:
void setAction(Action *newAction);
void setAction(Action *newAction, bool loadingSave);
- void setPage(Page *page) { _page = page;}
-
protected:
Page *_page;
Commit: cedf844ae4ba7312fc91f384610bb790332d2e2a
https://github.com/scummvm/scummvm/commit/cedf844ae4ba7312fc91f384610bb790332d2e2a
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T21:06:23+03:00
Commit Message:
PINK: JANITORIAL: fixed typo
Changed paths:
engines/pink/objects/sequences/sequencer.cpp
engines/pink/objects/sequences/sequencer.h
diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp
index 352543f265..4a7c1c0768 100644
--- a/engines/pink/objects/sequences/sequencer.cpp
+++ b/engines/pink/objects/sequences/sequencer.cpp
@@ -69,7 +69,7 @@ void Sequencer::authorSequence(Sequence *sequence, bool loadingSave) {
if (sequence) {
SequenceContext *context = new SequenceContext(sequence);
SequenceContext *conflict;
- while ((conflict = findConfilictingContextWith(context)) != nullptr) {
+ while ((conflict = findConflictingContextWith(context)) != nullptr) {
conflict->getSequence()->forceEnd();
}
_context = context;
@@ -90,7 +90,7 @@ void Sequencer::authorParallelSequence(Sequence *sequence, bool loadingSave) {
const Common::String leadName = _page->getLeadActor()->getName();
SequenceContext *context = new SequenceContext(sequence);
- if (!context->findState(leadName) && !findConfilictingContextWith(context)) {
+ if (!context->findState(leadName) && !findConflictingContextWith(context)) {
_parrallelContexts.push_back(context);
sequence->init(loadingSave);
debugC(6, kPinkDebugScripts, "Parallel Sequence %s started", sequence->getName().c_str());
@@ -189,7 +189,7 @@ void Sequencer::saveState(Archive &archive) {
}
}
-SequenceContext *Sequencer::findConfilictingContextWith(SequenceContext *context) {
+SequenceContext *Sequencer::findConflictingContextWith(SequenceContext *context) {
if (_context && _context->isConflictingWith(context)) {
return _context;
}
diff --git a/engines/pink/objects/sequences/sequencer.h b/engines/pink/objects/sequences/sequencer.h
index 114f1c58f7..a90faa3b85 100644
--- a/engines/pink/objects/sequences/sequencer.h
+++ b/engines/pink/objects/sequences/sequencer.h
@@ -59,7 +59,7 @@ public:
void removeContext(SequenceContext *context);
- SequenceContext *findConfilictingContextWith(SequenceContext *context);
+ SequenceContext *findConflictingContextWith(SequenceContext *context);
Sequence *findSequence(const Common::String &name);
SequenceActorState *findState(const Common::String &name);
Commit: 0d18e0757f6b4759aa945019d0d1e897bf5bfb15
https://github.com/scummvm/scummvm/commit/0d18e0757f6b4759aa945019d0d1e897bf5bfb15
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T21:09:01+03:00
Commit Message:
PINK: JANITORIAL: fixed typo
Changed paths:
engines/pink/objects/sequences/sequencer.cpp
engines/pink/objects/sequences/sequencer.h
diff --git a/engines/pink/objects/sequences/sequencer.cpp b/engines/pink/objects/sequences/sequencer.cpp
index 4a7c1c0768..6475edce93 100644
--- a/engines/pink/objects/sequences/sequencer.cpp
+++ b/engines/pink/objects/sequences/sequencer.cpp
@@ -44,8 +44,8 @@ Sequencer::~Sequencer() {
delete _timers[i];
}
delete _context;
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- delete _parrallelContexts[i];
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ delete _parallelContexts[i];
}
}
@@ -82,8 +82,8 @@ void Sequencer::authorParallelSequence(Sequence *sequence, bool loadingSave) {
if (_context && _context->getSequence() == sequence)
return;
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- if (_parrallelContexts[i]->getSequence() == sequence)
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ if (_parallelContexts[i]->getSequence() == sequence)
return;
}
@@ -91,7 +91,7 @@ void Sequencer::authorParallelSequence(Sequence *sequence, bool loadingSave) {
SequenceContext *context = new SequenceContext(sequence);
if (!context->findState(leadName) && !findConflictingContextWith(context)) {
- _parrallelContexts.push_back(context);
+ _parallelContexts.push_back(context);
sequence->init(loadingSave);
debugC(6, kPinkDebugScripts, "Parallel Sequence %s started", sequence->getName().c_str());
} else
@@ -113,8 +113,8 @@ void Sequencer::update() {
if (_context)
_context->getSequence()->update();
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- _parrallelContexts[i]->getSequence()->update();
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ _parallelContexts[i]->getSequence()->update();
}
uint time = _page->getGame()->getTotalPlayTime();
@@ -133,10 +133,10 @@ void Sequencer::removeContext(SequenceContext *context) {
return;
}
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- if (context == _parrallelContexts[i]) {
- delete _parrallelContexts[i];
- _parrallelContexts.remove_at(i);
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ if (context == _parallelContexts[i]) {
+ delete _parallelContexts[i];
+ _parallelContexts.remove_at(i);
break;
}
}
@@ -183,9 +183,9 @@ void Sequencer::saveState(Archive &archive) {
sequenceName = _context->getSequence()->getName();
archive.writeString(sequenceName);
- archive.writeWORD(_parrallelContexts.size());
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- archive.writeString(_parrallelContexts[i]->getSequence()->getName());
+ archive.writeWORD(_parallelContexts.size());
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ archive.writeString(_parallelContexts[i]->getSequence()->getName());
}
}
@@ -193,9 +193,9 @@ SequenceContext *Sequencer::findConflictingContextWith(SequenceContext *context)
if (_context && _context->isConflictingWith(context)) {
return _context;
}
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- if (_parrallelContexts[i]->isConflictingWith(context))
- return _parrallelContexts[i];
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ if (_parallelContexts[i]->isConflictingWith(context))
+ return _parallelContexts[i];
}
return nullptr;
}
@@ -205,8 +205,8 @@ SequenceActorState *Sequencer::findState(const Common::String &name) {
if (_context && (state = _context->findState(name)))
return state;
- for (uint i = 0; i < _parrallelContexts.size(); ++i) {
- state = _parrallelContexts[i]->findState(name);
+ for (uint i = 0; i < _parallelContexts.size(); ++i) {
+ state = _parallelContexts[i]->findState(name);
if (state)
break;
}
diff --git a/engines/pink/objects/sequences/sequencer.h b/engines/pink/objects/sequences/sequencer.h
index a90faa3b85..22ea59ef3a 100644
--- a/engines/pink/objects/sequences/sequencer.h
+++ b/engines/pink/objects/sequences/sequencer.h
@@ -69,7 +69,7 @@ public:
private:
SequenceContext *_context;
GamePage *_page;
- Common::Array<SequenceContext *> _parrallelContexts;
+ Common::Array<SequenceContext *> _parallelContexts;
Array<Sequence *> _sequences;
Array<SeqTimer *> _timers;
uint _time;
Commit: c6450e49ce6ac28388192790948ad14401b495d6
https://github.com/scummvm/scummvm/commit/c6450e49ce6ac28388192790948ad14401b495d6
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-06-04T21:22:16+03:00
Commit Message:
PINK: pass string by reference in SequenceActorState ctor
Changed paths:
engines/pink/objects/sequences/sequence_context.h
diff --git a/engines/pink/objects/sequences/sequence_context.h b/engines/pink/objects/sequences/sequence_context.h
index eea87afa94..e650927d5e 100644
--- a/engines/pink/objects/sequences/sequence_context.h
+++ b/engines/pink/objects/sequences/sequence_context.h
@@ -31,7 +31,7 @@ class Sequence;
class Sequencer;
struct SequenceActorState {
- SequenceActorState(const Common::String actor)
+ SequenceActorState(const Common::String &actor)
: actorName(actor), _segment(0) {}
void execute(uint segment, Sequence *sequence, bool loadingSave) const;
More information about the Scummvm-git-logs
mailing list