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

Remove unnecessary Map usage from MissionBrowserLogic.

Browse Source
This commit is contained in:
Paul Chote
2016-02-05 21:35:21 +00:00
parent e13e0792f6
commit 4328f24276
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Mods.Common/Widgets/Logic/MissionBrowserLogic.cs
View File

@@ -40,6 +40,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
readonly ScrollItemWidget template; readonly ScrollItemWidget template;
MapPreview selectedMapPreview; MapPreview selectedMapPreview;
Map selectedMap;
PlayingVideo playingVideo; PlayingVideo playingVideo;
@@ -161,16 +162,17 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void SelectMap(Map map) void SelectMap(Map map)
{ {
selectedMap = map;
selectedMapPreview = Game.ModData.MapCache[map.Uid]; selectedMapPreview = Game.ModData.MapCache[map.Uid];
// Cache the rules on a background thread to avoid jank // Cache the rules on a background thread to avoid jank
new Thread(selectedMapPreview.CacheRules).Start(); new Thread(selectedMapPreview.CacheRules).Start();
var briefingVideo = selectedMapPreview.Map.Videos.Briefing; var briefingVideo = map.Videos.Briefing;
var briefingVideoVisible = briefingVideo != null; var briefingVideoVisible = briefingVideo != null;
var briefingVideoDisabled = !(briefingVideoVisible && Game.ModData.ModFiles.Exists(briefingVideo)); var briefingVideoDisabled = !(briefingVideoVisible && Game.ModData.ModFiles.Exists(briefingVideo));
var infoVideo = selectedMapPreview.Map.Videos.BackgroundInfo; var infoVideo = map.Videos.BackgroundInfo;
var infoVideoVisible = infoVideo != null; var infoVideoVisible = infoVideo != null;
var infoVideoDisabled = !(infoVideoVisible && Game.ModData.ModFiles.Exists(infoVideo)); var infoVideoDisabled = !(infoVideoVisible && Game.ModData.ModFiles.Exists(infoVideo));
@@ -291,7 +293,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
if (selectedMapPreview.RuleStatus != MapRuleStatus.Cached) if (selectedMapPreview.RuleStatus != MapRuleStatus.Cached)
return; return;
var gameStartVideo = selectedMapPreview.Map.Videos.GameStart; var gameStartVideo = selectedMap.Videos.GameStart;
if (gameStartVideo != null && Game.ModData.ModFiles.Exists(gameStartVideo)) if (gameStartVideo != null && Game.ModData.ModFiles.Exists(gameStartVideo))
{ {
var fsPlayer = fullscreenVideoPlayer.Get<VqaPlayerWidget>("PLAYER"); var fsPlayer = fullscreenVideoPlayer.Get<VqaPlayerWidget>("PLAYER");