epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialise frame time when playing a new sequence.

Browse Source 
Fixes #3706, #6389.
This commit is contained in:
Paul Chote
2015-02-15 17:01:52 +00:00
parent e2da1f11cb
commit e9caf7f6e6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Graphics/Animation.cs
View File

@@ -79,6 +79,8 @@ namespace OpenRA.Graphics
backwards = false; backwards = false;
tickAlways = false; tickAlways = false;
CurrentSequence = sequenceProvider.GetSequence(name, sequenceName); CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
frame = 0; frame = 0;
tickFunc = () => tickFunc = () =>
{ {
@@ -94,6 +96,8 @@ namespace OpenRA.Graphics
return false; return false;
CurrentSequence = sequenceProvider.GetSequence(name, sequenceName); CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
var tick = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
timeUntilNextFrame = Math.Min(tick, timeUntilNextFrame);
frame %= CurrentSequence.Length; frame %= CurrentSequence.Length;
return true; return true;
} }
@@ -103,6 +107,8 @@ namespace OpenRA.Graphics
backwards = false; backwards = false;
tickAlways = false; tickAlways = false;
CurrentSequence = sequenceProvider.GetSequence(name, sequenceName); CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
frame = 0; frame = 0;
tickFunc = () => tickFunc = () =>
{ {
@@ -127,6 +133,8 @@ namespace OpenRA.Graphics
backwards = false; backwards = false;
tickAlways = true; tickAlways = true;
CurrentSequence = sequenceProvider.GetSequence(name, sequenceName); CurrentSequence = sequenceProvider.GetSequence(name, sequenceName);
timeUntilNextFrame = CurrentSequence != null ? CurrentSequence.Tick : defaultTick;
frame = func(); frame = func();
tickFunc = () => frame = func(); tickFunc = () => frame = func();
} }