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

successful gamestart; shroud is borked

Browse Source
This commit is contained in:
Chris Forbes
2010-03-17 21:39:16 +13:00
parent 38172dcda5
commit bd35f48e48
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Game.cs
View File

@@ -271,6 +271,8 @@ namespace OpenRA
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
world.players[i] = new Player(world, i, LobbyInfo.Clients.FirstOrDefault(a => a.Index == i)); world.players[i] = new Player(world, i, LobbyInfo.Clients.FirstOrDefault(a => a.Index == i));
world.Queries = new World.AllQueries(world);
foreach (var gs in world.WorldActor.traits.WithInterface<IGameStarted>()) foreach (var gs in world.WorldActor.traits.WithInterface<IGameStarted>())
gs.GameStarted(world); gs.GameStarted(world);

3
OpenRA.Game/Graphics/Viewport.cs
View File

@@ -65,7 +65,8 @@ namespace OpenRA.Graphics
ConnectionState lastConnectionState = ConnectionState.PreConnecting; ConnectionState lastConnectionState = ConnectionState.PreConnecting;
public void DrawRegions( World world ) public void DrawRegions( World world )
{ {
world.WorldRenderer.palette.Update(world.Queries.WithTraitMultiple<IPaletteModifier>().Select(t=>t.Trait)); world.WorldRenderer.palette.Update(
world.WorldActor.traits.WithInterface<IPaletteModifier>());
float2 r1 = new float2(2, -2) / screenSize; float2 r1 = new float2(2, -2) / screenSize;
float2 r2 = new float2(-1, 1); float2 r2 = new float2(-1, 1);

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

@@ -37,8 +37,8 @@ namespace OpenRA.Traits
if (IsBridge(w, w.Map.MapTiles[i, j].tile)) if (IsBridge(w, w.Map.MapTiles[i, j].tile))
ConvertBridgeToActor(w, i, j); ConvertBridgeToActor(w, i, j);
foreach (var br in w.Queries.WithTraitMultiple<Bridge>()) foreach (var br in w.Actors.SelectMany(a => a.traits.WithInterface<Bridge>()))
br.Trait.FinalizeBridges(w); br.FinalizeBridges(w);
} }
static void ConvertBridgeToActor(World w, int i, int j) static void ConvertBridgeToActor(World w, int i, int j)

5
OpenRA.Game/World.cs
View File

@@ -99,9 +99,6 @@ namespace OpenRA
Timer.Time( "worldActor, players: {0}" ); Timer.Time( "worldActor, players: {0}" );
Queries = new AllQueries( this );
Timer.Time( "queries: {0}" );
foreach (var wlh in WorldActor.traits.WithInterface<ILoadWorldHook>()) foreach (var wlh in WorldActor.traits.WithInterface<ILoadWorldHook>())
wlh.WorldLoaded(this); wlh.WorldLoaded(this);
@@ -252,6 +249,6 @@ namespace OpenRA
} }
} }
public readonly AllQueries Queries; public AllQueries Queries;
} }
} }