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

2009-10-10 21:23:53 +13:00
parent b880f7d1bc 70bc8366a5
commit 296092f9f6
6 changed files with 30 additions and 6 deletions
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.Windows.Forms;
+using System.Windows.Forms;
+using OpenRa.Game.Graphics;

 namespace OpenRa.Game
 {
@@ -28,7 +29,9 @@ namespace OpenRa.Game
 				lastTime += 40;

 				foreach( Actor a in actors )
-					a.Tick( game, 40 );
+					a.Tick( game, 40 );
+
+				Renderer.waterFrame += 0.05f;
 			}

 			foreach (Action<World> a in frameEndActions) a(this);