Remove BS from Viewport

This commit is contained in:
Paul Chote
2010-07-11 16:17:20 +12:00
parent b4a84deb86
commit 6d49dcece1
4 changed files with 41 additions and 56 deletions

View File

@@ -163,7 +163,7 @@ namespace OpenRA
Timer.Time("----end LoadMap");
Debug("Map change {0} -> {1}".F(Game.mapName, mapName));
}
public static void MoveViewport(int2 loc)
{
viewport.Center(loc);
@@ -255,7 +255,10 @@ namespace OpenRA
Log.Write("sync", "Sync for net frame {0} -------------", f.First);
Log.Write("sync", "{0}", f.Second);
}
public static event Action ConnectionStateChanged = () => { };
static ConnectionState lastConnectionState = ConnectionState.PreConnecting;
static void Tick()
{
if (packageChangePending)
@@ -273,8 +276,14 @@ namespace OpenRA
mapName = LobbyInfo.GlobalSettings.Map;
mapChangePending = false;
return;
}
}
if (orderManager.Connection.ConnectionState != lastConnectionState)
{
lastConnectionState = orderManager.Connection.ConnectionState;
ConnectionStateChanged();
}
int t = Environment.TickCount;
int dt = t - lastTime;
if (dt >= Settings.Timestep)
@@ -397,7 +406,8 @@ namespace OpenRA
gs.GameStarted(world);
orderManager.StartGame();
}
public static event Action OnGameStart = () => { };
internal static void StartGame()
{
LoadMap(LobbyInfo.GlobalSettings.Map);
@@ -410,7 +420,8 @@ namespace OpenRA
gs.GameStarted(world);
viewport.GoToStartLocation(world.LocalPlayer);
orderManager.StartGame();
orderManager.StartGame();
OnGameStart();
}
public static Stance ChooseInitialStance(Player p, Player q)