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

2
OpenRa.Game/Chrome.cs
View File

@@ -430,7 +430,7 @@ namespace OpenRa.Game
leftOffset.X += 1; leftOffset.X += 1;
rightOffset.X -= 1; rightOffset.X -= 1;
} }
lineRenderer.DrawLine(barStart + leftOffset, powerLevel + rightOffset, color, color); lineRenderer.DrawLine(Game.viewport.Location + barStart + leftOffset, Game.viewport.Location + powerLevel + rightOffset, color, color);
} }
lineRenderer.Flush(); lineRenderer.Flush();

17
OpenRa.Game/Game.cs
View File

@@ -57,6 +57,7 @@ namespace OpenRa.Game
public static void ChangeMap(string mapName) public static void ChangeMap(string mapName)
{ {
chat.AddLine(Color.White, "Debug", "Map change {0} -> {1}".F(Game.mapName, mapName));
Game.changePending = false; Game.changePending = false;
Game.mapName = mapName; Game.mapName = mapName;
SheetBuilder.Initialize(renderer); SheetBuilder.Initialize(renderer);
@@ -388,8 +389,6 @@ namespace OpenRa.Game
LobbyInfo = session; 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 if (Game.orderManager.FramesAhead != LobbyInfo.GlobalSettings.OrderLatency
&& !Game.orderManager.GameStarted) && !Game.orderManager.GameStarted)
{ {
@@ -398,19 +397,9 @@ namespace OpenRa.Game
"Order lag is now {0} frames.".F(LobbyInfo.GlobalSettings.OrderLatency)); "Order lag is now {0} frames.".F(LobbyInfo.GlobalSettings.OrderLatency));
} }
PackageDownloader.SetPackageList(LobbyInfo.GlobalSettings.Packages); if (PackageDownloader.SetPackageList(LobbyInfo.GlobalSettings.Packages)
if (!PackageDownloader.IsIdle()) || mapName != LobbyInfo.GlobalSettings.Map)
{
changePending = true; 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() public static void StartGame()

8
OpenRa.Game/PackageDownloader.cs
View File

@@ -20,8 +20,12 @@ namespace OpenRa.Game
public static float Fraction { get; private set; } public static float Fraction { get; private set; }
public static int DownloadedBytes { get { return (int)content.Length; } } public static int DownloadedBytes { get { return (int)content.Length; } }
public static void SetPackageList(string[] packages) public static bool SetPackageList(string[] packages)
{ {
if (!(allPackages.Except(packages).Any()
|| packages.Except(allPackages).Any()))
return false;
allPackages = packages; allPackages = packages;
missingPackages = allPackages.Where(p => !HavePackage(p)).ToList(); missingPackages = allPackages.Where(p => !HavePackage(p)).ToList();
@@ -29,6 +33,8 @@ namespace OpenRa.Game
BeginDownload(); BeginDownload();
else else
missingPackages.Remove(currentPackage); missingPackages.Remove(currentPackage);
return true;
} }
class Chunk { public int Index = 0; public int Count = 0; public string Data = ""; } class Chunk { public int Index = 0; public int Count = 0; public string Data = ""; }