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

Move the mod-level initialisation code back into the load screen.

Browse Source
This commit is contained in:
Paul Chote
2014-12-13 12:47:34 +13:00
parent 711a1ca5fc
commit ec7a32184e
11 changed files with 97 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
OpenRA.Game/Game.cs
View File

@@ -331,45 +331,7 @@ namespace OpenRA
Environment.Exit(0);
}
else
{
var window = args != null ? args.GetValue("Launch.Window", null) : null;
if (!string.IsNullOrEmpty(window))
{
var installData = modData.Manifest.ContentInstaller;
if (installData.InstallerBackgroundWidget != null)
Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, new WidgetArgs());
Widgets.Ui.OpenWindow(window, new WidgetArgs());
}
else
{
modData.LoadScreen.StartGame();
Settings.Save();
var replay = args != null ? args.GetValue("Launch.Replay", null) : null;
if (!string.IsNullOrEmpty(replay))
Game.JoinReplay(replay);
}
}
}
public static void TestAndContinue()
{
Ui.ResetAll();
var installData = modData.Manifest.ContentInstaller;
if (!installData.TestFiles.All(f => GlobalFileSystem.Exists(f)))
{
var args = new WidgetArgs()
{
{ "continueLoading", () => InitializeMod(Game.Settings.Game.Mod, null) },
};
if (installData.InstallerBackgroundWidget != null)
Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, args);
Ui.OpenWindow(installData.InstallerMenuWidget, args);
}
else
LoadShellMap();
modData.LoadScreen.StartGame(args);
}
public static void LoadShellMap()

2
OpenRA.Game/ModData.cs
View File

@@ -184,6 +184,6 @@ namespace OpenRA
{
void Init(Manifest m, Dictionary<string, string> info);
void Display();
void StartGame();
void StartGame(Arguments args);
}
}

17
OpenRA.Mods.Cnc/CncLoadScreen.cs
View File

@@ -12,12 +12,15 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using OpenRA.Graphics;
using OpenRA.Mods.Common.LoadScreens;
using OpenRA.Widgets;
namespace OpenRA.Mods.Cnc
{
public sealed class CncLoadScreen : ILoadScreen
public sealed class CncLoadScreen : BlankLoadScreen
{
readonly NullInputHandler nih = new NullInputHandler();
Dictionary<string, string> loadInfo;
Stopwatch loadTimer = Stopwatch.StartNew();
Sheet sheet;
@@ -27,9 +30,8 @@ namespace OpenRA.Mods.Cnc
Sprite nodLogo, gdiLogo, evaLogo, brightBlock, dimBlock;
Rectangle bounds;
Renderer r;
readonly NullInputHandler nih = new NullInputHandler();
public void Init(Manifest m, Dictionary<string, string> info)
public override void Init(Manifest m, Dictionary<string, string> info)
{
loadInfo = info;
@@ -72,7 +74,7 @@ namespace OpenRA.Mods.Cnc
string loadingText, versionText;
float2 loadingPos, versionPos;
public void Display()
public override void Display()
{
if (r == null || loadTimer.Elapsed.TotalSeconds < 0.25)
return;
@@ -118,12 +120,7 @@ namespace OpenRA.Mods.Cnc
r.EndFrame(nih);
}
public void StartGame()
{
Game.TestAndContinue();
}
public void Dispose()
public override void Dispose()
{
if (sheet != null)
sheet.Dispose();

78
OpenRA.Mods.Common/LoadScreens/BlankLoadScreen.cs Normal file
View File

@@ -0,0 +1,78 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Collections.Generic;
using System.Linq;
using OpenRA.FileSystem;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.LoadScreens
{
public class BlankLoadScreen : ILoadScreen
{
public virtual void Init(Manifest m, Dictionary<string, string> info) { }
public virtual void Display()
{
if (Game.Renderer == null)
return;
// Draw a black screen
Game.Renderer.BeginFrame(int2.Zero, 1f);
Game.Renderer.EndFrame(new NullInputHandler());
}
void TestAndContinue()
{
Ui.ResetAll();
var installData = Game.modData.Manifest.ContentInstaller;
if (!installData.TestFiles.All(f => GlobalFileSystem.Exists(f)))
{
var args = new WidgetArgs()
{
{ "continueLoading", () => Game.InitializeMod(Game.Settings.Game.Mod, null) },
};
if (installData.InstallerBackgroundWidget != null)
Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, args);
Ui.OpenWindow(installData.InstallerMenuWidget, args);
}
else
Game.LoadShellMap();
Game.Settings.Save();
}
public void StartGame(Arguments args)
{
var window = args != null ? args.GetValue("Launch.Window", null) : null;
if (!string.IsNullOrEmpty(window))
{
var installData = Game.modData.Manifest.ContentInstaller;
if (installData.InstallerBackgroundWidget != null)
Ui.LoadWidget(installData.InstallerBackgroundWidget, Ui.Root, new WidgetArgs());
Ui.OpenWindow(window, new WidgetArgs());
}
else
{
TestAndContinue();
var replay = args != null ? args.GetValue("Launch.Replay", null) : null;
if (!string.IsNullOrEmpty(replay))
Game.JoinReplay(replay);
}
}
public virtual void Dispose() { }
}
}

13
OpenRA.Mods.Common/LoadScreens/DefaultLoadScreen.cs → OpenRA.Mods.Common/LoadScreens/LogoStripeLoadScreen.cs
View File

@@ -16,7 +16,7 @@ using OpenRA.Widgets;
namespace OpenRA.Mods.Common.LoadScreens
{
public sealed class DefaultLoadScreen : ILoadScreen
public sealed class LogoStripeLoadScreen : BlankLoadScreen
{
Stopwatch lastUpdate = Stopwatch.StartNew();
Renderer r;
@@ -27,7 +27,7 @@ namespace OpenRA.Mods.Common.LoadScreens
Sprite stripe, logo;
string[] messages;
public void Init(Manifest m, Dictionary<string, string> info)
public override void Init(Manifest m, Dictionary<string, string> info)
{
// Avoid standard loading mechanisms so we
// can display the loadscreen as early as possible
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.LoadScreens
logoPos = new float2(r.Resolution.Width / 2 - 128, r.Resolution.Height / 2 - 128);
}
public void Display()
public override void Display()
{
if (r == null)
return;
@@ -66,12 +66,7 @@ namespace OpenRA.Mods.Common.LoadScreens
r.EndFrame(new NullInputHandler());
}
public void StartGame()
{
Game.TestAndContinue();
}
public void Dispose()
public override void Dispose()
{
if (sheet != null)
sheet.Dispose();

2
OpenRA.Mods.Common/LoadScreens/ModChooserLoadScreen.cs
View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.LoadScreens
r.EndFrame(new NullInputHandler());
}
public void StartGame()
public void StartGame(Arguments args)
{
Ui.LoadWidget("MODCHOOSER", Ui.Root, new WidgetArgs());
}

39
OpenRA.Mods.Common/LoadScreens/NullLoadScreen.cs
View File

@@ -1,39 +0,0 @@
#region Copyright & License Information
/*
* Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
* This file is part of OpenRA, which is free software. It is made
* available to you under the terms of the GNU General Public License
* as published by the Free Software Foundation. For more information,
* see COPYING.
*/
#endregion
using System.Collections.Generic;
using OpenRA.Widgets;
namespace OpenRA.Mods.Common.LoadScreens
{
public sealed class NullLoadScreen : ILoadScreen
{
public void Init(Manifest m, Dictionary<string, string> info) { }
public void Display()
{
if (Game.Renderer == null)
return;
// Draw a black screen
Game.Renderer.BeginFrame(int2.Zero, 1f);
Game.Renderer.EndFrame(new NullInputHandler());
}
public void StartGame()
{
Ui.ResetAll();
}
public void Dispose()
{
}
}
}

4
OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
View File

@@ -78,9 +78,7 @@
<Compile Include="Graphics\TextRenderable.cs" />
<Compile Include="Graphics\VoxelActorPreview.cs" />
<Compile Include="Graphics\VoxelRenderable.cs" />
<Compile Include="LoadScreens\DefaultLoadScreen.cs" />
<Compile Include="LoadScreens\ModChooserLoadScreen.cs" />
<Compile Include="LoadScreens\NullLoadScreen.cs" />
<Compile Include="Orders\DeployOrderTargeter.cs" />
<Compile Include="Orders\EnterAlliedActorTargeter.cs" />
<Compile Include="Orders\UnitOrderTargeter.cs" />
@@ -239,6 +237,8 @@
<Compile Include="SpriteLoaders\ShpD2Loader.cs" />
<Compile Include="Widgets\Logic\SettingsLogic.cs" />
<Compile Include="Widgets\TerrainTemplatePreviewWidget.cs" />
<Compile Include="LoadScreens\LogoStripeLoadScreen.cs" />
<Compile Include="LoadScreens\BlankLoadScreen.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>

2
mods/d2k/mod.yaml
View File

@@ -117,7 +117,7 @@ Movies:
Translations:
./mods/d2k/languages/english.yaml
LoadScreen: DefaultLoadScreen
LoadScreen: LogoStripeLoadScreen
Image: ./mods/d2k/uibits/loadscreen.png
Text: Filling Crates..., Breeding Sandworms...

2
mods/ra/mod.yaml
View File

@@ -132,7 +132,7 @@ Movies:
Translations:
./mods/ra/languages/english.yaml
LoadScreen: DefaultLoadScreen
LoadScreen: LogoStripeLoadScreen
Image: ./mods/ra/uibits/loadscreen.png
Text: Filling Crates..., Charging Capacitors..., Reticulating Splines..., Planting Trees..., Building Bridges..., Aging Empires..., Compiling EVA..., Constructing Pylons..., Activating Skynet..., Splitting Atoms...

2
mods/ts/mod.yaml
View File

@@ -162,7 +162,7 @@ Movies:
Translations:
./mods/ts/languages/english.yaml
LoadScreen: DefaultLoadScreen
LoadScreen: LogoStripeLoadScreen
Image: ./mods/ts/uibits/loadscreen.png
Text: Updating EVA installation..., Changing perspective...