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

Fix unnecessary uses of Game.ModData.

Browse Source
This commit is contained in:
Paul Chote
2016-03-29 22:30:29 +01:00
parent 2150a5e865
commit fee899f63d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Map/MapCache.cs
View File

@@ -81,7 +81,7 @@ namespace OpenRA
if (!modData.Manifest.Contains<MapGrid>()) if (!modData.Manifest.Contains<MapGrid>())
return; return;
var mapGrid = Game.ModData.Manifest.Get<MapGrid>(); var mapGrid = modData.Manifest.Get<MapGrid>();
foreach (var kv in MapLocations) foreach (var kv in MapLocations)
{ {
foreach (var map in kv.Key.Contents) foreach (var map in kv.Key.Contents)

2
OpenRA.Game/Server/Server.cs
View File

@@ -418,7 +418,7 @@ namespace OpenRA.Server
int latency = 1; int latency = 1;
if (!LobbyInfo.IsSinglePlayer) if (!LobbyInfo.IsSinglePlayer)
{ {
var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>(); var gameSpeeds = ModData.Manifest.Get<GameSpeeds>();
GameSpeed speed; GameSpeed speed;
if (gameSpeeds.Speeds.TryGetValue(LobbyInfo.GlobalSettings.GameSpeedType, out speed)) if (gameSpeeds.Speeds.TryGetValue(LobbyInfo.GlobalSettings.GameSpeedType, out speed))
latency = speed.OrderLatency; latency = speed.OrderLatency;

2
OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
View File

@@ -719,7 +719,7 @@ namespace OpenRA.Mods.Common.Server
return true; return true;
} }
var gameSpeeds = Game.ModData.Manifest.Get<GameSpeeds>(); var gameSpeeds = server.ModData.Manifest.Get<GameSpeeds>();
GameSpeed speed; GameSpeed speed;
if (!gameSpeeds.Speeds.TryGetValue(s, out speed)) if (!gameSpeeds.Speeds.TryGetValue(s, out speed))