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

Merge pull request #7072 from obrakmann/fmv-overhaul

Browse Source 
Move FMV playback from Lua scripts to widgets
This commit is contained in:
Paul Chote
2014-12-19 17:43:07 +13:00
parent e3068a8032 e342619ac7
commit 5b011e6baf
32 changed files with 342 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Mods.Common/UtilityCommands/LegacyMapImporter.cs
View File

@@ -157,6 +157,8 @@ namespace OpenRA.Mods.Common.UtilityCommands
map.MapResources = Exts.Lazy(() => new CellLayer<ResourceTile>(TileShape.Rectangle, size));
map.MapTiles = Exts.Lazy(() => new CellLayer<TerrainTile>(TileShape.Rectangle, size));
map.Videos = new MapVideos();
map.Options = new MapOptions();
if (legacyMapFormat == IniMapFormat.RedAlert)
@@ -174,6 +176,7 @@ namespace OpenRA.Mods.Common.UtilityCommands
ReadCncTrees(file);
}
LoadVideos(file, "BASIC");
LoadActors(file, "STRUCTURES");
LoadActors(file, "UNITS");
LoadActors(file, "INFANTRY");
@@ -502,5 +505,33 @@ namespace OpenRA.Mods.Common.UtilityCommands
map.Players.Add(section, pr);
}
void LoadVideos(IniFile file, string section)
{
foreach (var s in file.GetSection(section))
{
if (s.Value != "x" && s.Value != "<none>")
{
switch (s.Key)
{
case "Intro":
map.Videos.BackgroundInfo = s.Value.ToLower() + ".vqa";
break;
case "Brief":
map.Videos.Briefing = s.Value.ToLower() + ".vqa";
break;
case "Action":
map.Videos.GameStart = s.Value.ToLower() + ".vqa";
break;
case "Win":
map.Videos.GameWon = s.Value.ToLower() + ".vqa";
break;
case "Lose":
map.Videos.GameLost = s.Value.ToLower() + ".vqa";
break;
}
}
}
}
}
}