Merge pull request #9853 from penev92/unglobalFileSystem

Unglobal file system
This commit is contained in:
Oliver Brakmann
2015-12-14 20:52:30 +01:00
49 changed files with 224 additions and 219 deletions

View File

@@ -14,7 +14,6 @@ using System.IO;
using Eluant;
using OpenRA.Effects;
using OpenRA.FileFormats;
using OpenRA.FileSystem;
using OpenRA.GameRules;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Effects;
@@ -165,10 +164,10 @@ namespace OpenRA.Mods.Common.Scripting
else
onCompleteRadar = () => { };
Stream s = null;
Stream s;
try
{
s = GlobalFileSystem.Open(movie);
s = Game.ModData.ModFiles.Open(movie);
}
catch (FileNotFoundException e)
{