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

merging bob's changes

Browse Source
This commit is contained in:
Chris Forbes
2009-10-09 19:19:39 +13:00
parent 02f0b882cb 382ff42397
commit d8c7d3288c
4 changed files with 85 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRa.Game/MainWindow.cs
View File

@@ -38,24 +38,20 @@ namespace OpenRa.Game
bool windowed = !settings.GetValue("fullscreen", false);
renderer = new Renderer(this, GetResolution(settings), windowed);
SheetBuilder.Initialize( renderer );
SheetBuilder.Initialize(renderer);
game = new Game( settings.GetValue( "map", "scm12ea.ini" ), renderer, new int2( ClientSize ) );
game = new Game(settings.GetValue("map", "scg11eb.ini"), renderer, new int2(ClientSize));
SequenceProvider.ForcePrecache();
Unit controlled;
game.world.Add( new Unit( "mcv", new int2( 5, 5 ), game.players[ 3 ], game ) );
game.world.Add( new Unit( "mcv", new int2( 7, 5 ), game.players[ 2 ], game ) );
game.world.Add(controlled = new Unit("mcv", new int2(9, 5), game.players[1], game));
game.controller.orderGenerator = controlled;
game.world.Add(new Unit("mcv", new int2(5, 5), game.players[3], game));
game.world.Add(new Unit("mcv", new int2(7, 5), game.players[2], game));
game.world.Add(new Unit("mcv", new int2(9, 5), game.players[1], game));
game.world.Add(new TurretedUnit("jeep", new int2(9, 7), game.players[1], game));
sidebar = new Sidebar(Race.Soviet, renderer, game);
renderer.SetPalette( new HardwarePalette( renderer, game.map ) );
renderer.SetPalette(new HardwarePalette(renderer, game.map));
}
internal void Run()