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

moved NeutralPlayer creation a bit earlier; bridge sections are now owned by NeutralPlayer rather than null

Browse Source
This commit is contained in:
Chris Forbes
2010-03-27 09:41:49 +13:00
parent 2829b0229b
commit 9c0c1e7827
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -289,8 +289,6 @@ namespace OpenRA
if( orderManager.GameStarted ) return; if( orderManager.GameStarted ) return;
chat.Reset(); chat.Reset();
world.AddPlayer(new Player(world, null)); // neutral player
foreach (var c in LobbyInfo.Clients) foreach (var c in LobbyInfo.Clients)
world.AddPlayer(new Player(world, c)); world.AddPlayer(new Player(world, c));

2
OpenRA.Game/Traits/World/BridgeLoadHook.cs
View File

@@ -72,7 +72,7 @@ namespace OpenRA.Traits
if (replacedTiles.Any()) if (replacedTiles.Any())
{ {
var a = w.CreateActor(template.Bridge, new int2(ni, nj), null); var a = w.CreateActor(template.Bridge, new int2(ni, nj), w.NeutralPlayer);
var br = a.traits.Get<Bridge>(); var br = a.traits.Get<Bridge>();
br.SetTiles(w, template, replacedTiles); br.SetTiles(w, template, replacedTiles);
} }

6
OpenRA.Game/World.cs
View File

@@ -84,7 +84,8 @@ namespace OpenRA
customTerrain = new ICustomTerrain[Map.MapSize, Map.MapSize]; customTerrain = new ICustomTerrain[Map.MapSize, Map.MapSize];
Timer.Time( "new Map: {0}" ); Timer.Time( "new Map: {0}" );
var theaterInfo = Rules.Info["world"].Traits.WithInterface<TheaterInfo>().FirstOrDefault(t => t.Theater == Map.Theater); var theaterInfo = Rules.Info["world"].Traits.WithInterface<TheaterInfo>()
.FirstOrDefault(t => t.Theater == Map.Theater);
TileSet = new TileSet(theaterInfo.Tileset, theaterInfo.Templates, theaterInfo.Suffix); TileSet = new TileSet(theaterInfo.Tileset, theaterInfo.Templates, theaterInfo.Suffix);
SpriteSheetBuilder.Initialize( Map ); SpriteSheetBuilder.Initialize( Map );
@@ -94,8 +95,9 @@ namespace OpenRA
Timer.Time("renderer: {0}"); Timer.Time("renderer: {0}");
WorldActor = CreateActor("World", new int2(int.MaxValue, int.MaxValue), null); WorldActor = CreateActor("World", new int2(int.MaxValue, int.MaxValue), null);
AddPlayer(new Player(this, null)); // add the neutral player
Timer.Time( "worldActor, players: {0}" ); Timer.Time( "worldActor: {0}" );
foreach (var wlh in WorldActor.traits.WithInterface<ILoadWorldHook>()) foreach (var wlh in WorldActor.traits.WithInterface<ILoadWorldHook>())
wlh.WorldLoaded(this); wlh.WorldLoaded(this);