FULLPIPE: Fix bugs in Movement::updateCurrDynamicPhase()

This commit is contained in:
Eugene Sandulenko 2013-08-29 14:01:35 +03:00
parent cac623a821
commit 638bd3014e
2 changed files with 14 additions and 4 deletions

View file

@ -1054,6 +1054,9 @@ DynamicPhase *Shadows::findSize(int width, int height) {
int idx = 0;
int min = 1000;
if (!_items.size())
return 0;
for (uint i = 0; i < _items.size(); i++) {
int w = abs(width - _items[i].width);
if (w < min) {

View file

@ -1279,11 +1279,18 @@ void Movement::initStatics(StaticANIObject *ani) {
}
void Movement::updateCurrDynamicPhase() {
if (_dynamicPhases.size() == 0)
return;
if (_currMovement) {
if (_currMovement->_dynamicPhases.size() == 0)
return;
if (_dynamicPhases[_currDynamicPhaseIndex]) {
_currDynamicPhase = (DynamicPhase *)_dynamicPhases[_currDynamicPhaseIndex];
if (_currMovement->_dynamicPhases[_currDynamicPhaseIndex])
_currDynamicPhase = (DynamicPhase *)_currMovement->_dynamicPhases[_currDynamicPhaseIndex];
} else {
if (_dynamicPhases.size() == 0)
return;
if (_dynamicPhases[_currDynamicPhaseIndex])
_currDynamicPhase = (DynamicPhase *)_dynamicPhases[_currDynamicPhaseIndex];
}
}