Index: cc/CCLayerAnimationController.cpp |
diff --git a/cc/CCLayerAnimationController.cpp b/cc/CCLayerAnimationController.cpp |
index aaef9f3f5ff75d6fbf97334f5b4a07d610bb75ed..6c64ac78551b72570872796e90af77eab6435b52 100644 |
--- a/cc/CCLayerAnimationController.cpp |
+++ b/cc/CCLayerAnimationController.cpp |
@@ -220,7 +220,7 @@ void CCLayerAnimationController::startAnimationsWaitingForNextTick(double monoto |
if (!m_activeAnimations[i]->hasSetStartTime()) |
m_activeAnimations[i]->setStartTime(monotonicTime); |
if (events) |
- events->append(CCAnimationEvent(CCAnimationEvent::Started, m_client->id(), m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); |
+ events->push_back(CCAnimationEvent(CCAnimationEvent::Started, m_client->id(), m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); |
} |
} |
} |
@@ -231,7 +231,7 @@ void CCLayerAnimationController::startAnimationsWaitingForStartTime(double monot |
if (m_activeAnimations[i]->runState() == CCActiveAnimation::WaitingForStartTime && m_activeAnimations[i]->startTime() <= monotonicTime) { |
m_activeAnimations[i]->setRunState(CCActiveAnimation::Running, monotonicTime); |
if (events) |
- events->append(CCAnimationEvent(CCAnimationEvent::Started, m_client->id(), m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); |
+ events->push_back(CCAnimationEvent(CCAnimationEvent::Started, m_client->id(), m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); |
} |
} |
} |
@@ -270,7 +270,7 @@ void CCLayerAnimationController::startAnimationsWaitingForTargetAvailability(dou |
if (!m_activeAnimations[i]->hasSetStartTime()) |
m_activeAnimations[i]->setStartTime(monotonicTime); |
if (events) |
- events->append(CCAnimationEvent(CCAnimationEvent::Started, m_client->id(), m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); |
+ events->push_back(CCAnimationEvent(CCAnimationEvent::Started, m_client->id(), m_activeAnimations[i]->group(), m_activeAnimations[i]->targetProperty(), monotonicTime)); |
for (size_t j = i + 1; j < m_activeAnimations.size(); ++j) { |
if (m_activeAnimations[i]->group() == m_activeAnimations[j]->group()) { |
m_activeAnimations[j]->setRunState(CCActiveAnimation::Running, monotonicTime); |
@@ -326,7 +326,7 @@ void CCLayerAnimationController::markAnimationsForDeletion(double monotonicTime, |
for (size_t j = i; j < m_activeAnimations.size(); j++) { |
if (groupId == m_activeAnimations[j]->group()) { |
if (events) |
- events->append(CCAnimationEvent(CCAnimationEvent::Finished, m_client->id(), m_activeAnimations[j]->group(), m_activeAnimations[j]->targetProperty(), monotonicTime)); |
+ events->push_back(CCAnimationEvent(CCAnimationEvent::Finished, m_client->id(), m_activeAnimations[j]->group(), m_activeAnimations[j]->targetProperty(), monotonicTime)); |
m_activeAnimations[j]->setRunState(CCActiveAnimation::WaitingForDeletion, monotonicTime); |
} |
} |
@@ -404,4 +404,4 @@ void CCLayerAnimationController::tickAnimations(double monotonicTime) |
} |
} |
-} // namespace cc |
+} // namespace cc |