nakidai
/
vectozavr-shooter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Animation timeline erase fix

master
Neirokan 2021-11-06 00:31:41 +03:00
parent f07f9a6638
commit dd307749be
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/animation/Timeline.cpp
View File

@ -70,16 +70,12 @@ void Timeline::update() {
return;
}
// TODO: sometimes I catch an exception here: EXC_BAD_ACCESS (code=EXC_I386_GPFLT)
for (auto&[listName, animationList] : _instance->_animations) {
if (animationList.empty()) {
/*
* TODO If you delete this line you will not catch an exception.
* Maybe something wrong with std::map::erase()
*/
_instance->_animations.erase(listName);
for (auto iter = _instance->_animations.begin(); iter != _instance->_animations.end(); ) {
if (iter->second.empty()) {
_instance->_animations.erase(iter++);
continue;
}
auto& animationList = iter->second;
auto it = animationList.begin();
// If it the front animation is 'a_wait()' we should wait until waiting time is over
@ -98,6 +94,7 @@ void Timeline::update() {
it++;
}
}
iter++;
}
}