support for the interior tileSet. trees don't work. mounted all 3 of the tileSet mixen; this means there are name-clashes in some cases.
This commit is contained in:
@@ -46,7 +46,6 @@ namespace OpenRa
|
||||
Game.changePending = false;
|
||||
Game.mapName = mapName;
|
||||
SheetBuilder.Initialize(renderer);
|
||||
SpriteSheetBuilder.Initialize();
|
||||
FileSystem.UnmountTemporaryPackages();
|
||||
Timer.Time( "reset: {0}" );
|
||||
|
||||
@@ -71,8 +70,8 @@ namespace OpenRa
|
||||
Timer.Time( "SeqProv, viewport: {0}" );
|
||||
|
||||
skipMakeAnims = true;
|
||||
foreach (var treeReference in Game.world.Map.Trees)
|
||||
world.CreateActor(treeReference.Image, new int2(treeReference.Location), null);
|
||||
//foreach (var treeReference in Game.world.Map.Trees)
|
||||
// world.CreateActor(treeReference.Image, new int2(treeReference.Location), null);
|
||||
Timer.Time( "trees: {0}" );
|
||||
|
||||
world.LoadMapActors(Rules.AllRules);
|
||||
|
||||
@@ -6,13 +6,19 @@ namespace OpenRa.Graphics
|
||||
{
|
||||
static class SpriteSheetBuilder
|
||||
{
|
||||
public static void Initialize()
|
||||
public static void Initialize( Map map )
|
||||
{
|
||||
exts = new[] {
|
||||
"." + map.Theater.Substring( 0, 3 ).ToLowerInvariant(),
|
||||
".shp",
|
||||
".tem",
|
||||
".sno",
|
||||
".int" };
|
||||
sprites = new Cache<string, Sprite[]>( LoadSprites );
|
||||
}
|
||||
|
||||
static Cache<string, Sprite[]> sprites;
|
||||
static readonly string[] exts = { ".tem", ".sno", ".int", ".shp" };
|
||||
static string[] exts;
|
||||
|
||||
static Sprite[] LoadSprites(string filename)
|
||||
{
|
||||
|
||||
@@ -56,9 +56,8 @@ namespace OpenRa
|
||||
|
||||
Map = new Map( Rules.AllRules );
|
||||
Timer.Time( "new Map: {0}" );
|
||||
FileSystem.MountTemporary( new Package( Map.Theater + ".mix" ) );
|
||||
Timer.Time( "mount temporary packages: {0}" );
|
||||
TileSet = new TileSet( Map.TileSuffix );
|
||||
SpriteSheetBuilder.Initialize( Map );
|
||||
Timer.Time( "Tileset: {0}" );
|
||||
|
||||
BuildingInfluence = new BuildingInfluenceMap( this );
|
||||
|
||||
Reference in New Issue
Block a user