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

Move rules and SSB init out of world

Browse Source
This commit is contained in:
Paul Chote
2010-08-19 00:09:48 +12:00
parent 08ffe1d44d
commit 1afcd2b98a
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenRA.Game/Game.cs
View File

@@ -140,12 +140,17 @@ namespace OpenRA
viewport = new Viewport(clientSize, map.TopLeft, map.BottomRight, Renderer); viewport = new Viewport(clientSize, map.TopLeft, map.BottomRight, Renderer);
world = null; // trying to access the old world will NRE, rather than silently doing it wrong. world = null; // trying to access the old world will NRE, rather than silently doing it wrong.
Timer.Time("viewport: {0}"); Timer.Time("viewport: {0}");
Rules.LoadRules(Manifest,map);
Timer.Time( "load rules: {0}" );
SpriteSheetBuilder.Initialize( Rules.TileSets[map.Tileset] );
SequenceProvider.Initialize(Manifest.Sequences);
Timer.Time("SeqProv: {0}");
world = new World(Manifest, map); world = new World(Manifest, map);
Timer.Time("world: {0}"); Timer.Time("world: {0}");
SequenceProvider.Initialize(Manifest.Sequences);
Timer.Time("ChromeProv, SeqProv: {0}");
Timer.Time("----end LoadMap"); Timer.Time("----end LoadMap");
Debug("Map change {0} -> {1}".F(Game.mapName, mapName)); Debug("Map change {0} -> {1}".F(Game.mapName, mapName));
} }

4
OpenRA.Game/World.cs
View File

@@ -80,11 +80,7 @@ namespace OpenRA
Timer.Time( "----World.ctor" ); Timer.Time( "----World.ctor" );
Map = map; Map = map;
Rules.LoadRules(manifest,Map);
Timer.Time( "load rules: {0}" );
TileSet = Rules.TileSets[Map.Tileset]; TileSet = Rules.TileSets[Map.Tileset];
SpriteSheetBuilder.Initialize( TileSet );
TileSet.LoadTiles(); TileSet.LoadTiles();
Timer.Time( "Tileset: {0}" ); Timer.Time( "Tileset: {0}" );