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

Merge pull request #9853 from penev92/unglobalFileSystem

Browse Source 
Unglobal file system
This commit is contained in:
Oliver Brakmann
2015-12-14 20:52:30 +01:00
parent bee590a057 d08a400565
commit 02fa63c1b4
49 changed files with 224 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenRA.Mods.D2k/Traits/World/FogPaletteFromR8.cs
View File

@@ -10,7 +10,6 @@
using System.Collections.Generic;
using System.IO;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -44,7 +43,7 @@ namespace OpenRA.Mods.D2k.Traits
public void LoadPalettes(WorldRenderer wr)
{
var colors = new uint[Palette.Size];
using (var s = GlobalFileSystem.Open(info.Filename))
using (var s = Game.ModData.ModFiles.Open(info.Filename))
{
s.Seek(info.Offset, SeekOrigin.Begin);

3
OpenRA.Mods.D2k/Traits/World/PaletteFromR8.cs
View File

@@ -10,7 +10,6 @@
using System.Collections.Generic;
using System.IO;
using OpenRA.FileSystem;
using OpenRA.Graphics;
using OpenRA.Mods.Common.Traits;
using OpenRA.Traits;
@@ -44,7 +43,7 @@ namespace OpenRA.Mods.D2k.Traits
public void LoadPalettes(WorldRenderer wr)
{
var colors = new uint[Palette.Size];
using (var s = GlobalFileSystem.Open(info.Filename))
using (var s = Game.ModData.ModFiles.Open(info.Filename))
{
s.Seek(info.Offset, SeekOrigin.Begin);