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

fixing mapchange trigger; also paint the power bar in the right place again (LineRenderer is still in worldspace)

Browse Source
This commit is contained in:
Chris Forbes
2010-01-16 20:58:08 +13:00
parent 2b72a89779
commit 950a2acb0b
3 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRa.Game/Game.cs
View File

@@ -57,6 +57,7 @@ namespace OpenRa.Game
public static void ChangeMap(string mapName)
{
chat.AddLine(Color.White, "Debug", "Map change {0} -> {1}".F(Game.mapName, mapName));
Game.changePending = false;
Game.mapName = mapName;
SheetBuilder.Initialize(renderer);
@@ -388,8 +389,6 @@ namespace OpenRa.Game
LobbyInfo = session;
// todo: if we don't have all the resources, we don't want to do this yet.
if (Game.orderManager.FramesAhead != LobbyInfo.GlobalSettings.OrderLatency
&& !Game.orderManager.GameStarted)
{
@@ -398,19 +397,9 @@ namespace OpenRa.Game
"Order lag is now {0} frames.".F(LobbyInfo.GlobalSettings.OrderLatency));
}
PackageDownloader.SetPackageList(LobbyInfo.GlobalSettings.Packages);
if (!PackageDownloader.IsIdle())
{
if (PackageDownloader.SetPackageList(LobbyInfo.GlobalSettings.Packages)
|| mapName != LobbyInfo.GlobalSettings.Map)
changePending = true;
return;
}
if (mapName != LobbyInfo.GlobalSettings.Map)
{
chat.AddLine(Color.White, "Debug",
"Map change {0} -> {1}".F(mapName, session.GlobalSettings.Map));
ChangeMap(LobbyInfo.GlobalSettings.Map);
}
}
public static void StartGame()