Merge branch 'master' of github.com:beedee/OpenRA
Conflicts: OpenRa.Game/Sidebar.cs
This commit is contained in:
@@ -126,7 +126,7 @@ namespace OpenRa.Game
|
||||
{
|
||||
if (kvp.Value != null)
|
||||
{
|
||||
clockRenderer.DrawSprite(clockAnimations[kvp.Key].Images[0], region.Location.ToFloat2() + kvp.Value.location, 0);
|
||||
clockRenderer.DrawSprite(clockAnimations[kvp.Key].Image, region.Location.ToFloat2() + kvp.Value.location, 0);
|
||||
clockAnimations[kvp.Key].Tick(1);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user