Merge pull request #342 from jdm/inventory

GRIM: Fix inventory display resetting to start of animation after each it
This commit is contained in:
Giulio Camuffo 2011-09-06 12:39:09 -07:00
commit ae4c126baa

View File

@ -107,8 +107,11 @@ int Animation::update(int time) {
else if (!_paused)
newTime = _time + time;
int marker = _keyframe->getMarker(_time / 1000.f, newTime / 1000.f);
_time = newTime;
int marker = 0;
if (!_paused) {
marker = _keyframe->getMarker(_time / 1000.f, newTime / 1000.f);
_time = newTime;
}
int animLength = (int)(_keyframe->getLength() * 1000);