Merge branch 'master' of github.com:beedee/OpenRA

Conflicts:
	OpenRa.Game/Sidebar.cs
This commit is contained in:
Matthew Bowra-Dean
2009-10-08 01:53:03 +13:00
20 changed files with 633 additions and 720 deletions

View File

@@ -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);
}
}