beginnings of removing rampant ../../../ from sources

git-svn-id: svn://svn.ijw.co.nz/svn/OpenRa@1318 993157c7-ee19-0410-b2c4-bb4e9862e678
This commit is contained in:
(no author)
2007-07-21 04:16:15 +00:00
parent c331e190a7
commit dde1852b12
11 changed files with 64 additions and 30 deletions

View File

@@ -33,6 +33,10 @@ namespace OpenRa.Game
public MainWindow(Settings settings)
{
FileSystem.Mount(new Folder("../../../"));
FileSystem.Mount(new Package("../../../conquer.mix"));
FileSystem.Mount(new Package("../../../hires.mix"));
FormBorderStyle = FormBorderStyle.None;
BackColor = Color.Black;
StartPosition = FormStartPosition.Manual;
@@ -42,14 +46,11 @@ namespace OpenRa.Game
bool windowed = !settings.GetValue("fullscreeen", false);
renderer = new Renderer(this, GetResolution(settings), windowed);
map = new Map(new IniFile(File.OpenRead("../../../" + settings.GetValue("map", "scm12ea.ini"))));
map = new Map(new IniFile(FileSystem.Open(settings.GetValue("map", "scm12ea.ini"))));
viewport = new Viewport(new float2(ClientSize), new float2(map.Size), renderer);
SheetBuilder.Initialize(renderer.Device);
TileMix = new Package("../../../" + map.Theater + ".mix");
FileSystem.Mount(TileMix = new Package("../../../" + map.Theater + ".mix"));
renderer.SetPalette(new HardwarePalette(renderer.Device, map));
terrain = new TerrainRenderer(renderer, map, TileMix, viewport);