successful gamestart; shroud is borked
This commit is contained in:
@@ -271,6 +271,8 @@ namespace OpenRA
|
||||
for (int i = 0; i < 8; 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>())
|
||||
gs.GameStarted(world);
|
||||
|
||||
|
||||
@@ -65,7 +65,8 @@ namespace OpenRA.Graphics
|
||||
ConnectionState lastConnectionState = ConnectionState.PreConnecting;
|
||||
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 r2 = new float2(-1, 1);
|
||||
|
||||
@@ -37,8 +37,8 @@ namespace OpenRA.Traits
|
||||
if (IsBridge(w, w.Map.MapTiles[i, j].tile))
|
||||
ConvertBridgeToActor(w, i, j);
|
||||
|
||||
foreach (var br in w.Queries.WithTraitMultiple<Bridge>())
|
||||
br.Trait.FinalizeBridges(w);
|
||||
foreach (var br in w.Actors.SelectMany(a => a.traits.WithInterface<Bridge>()))
|
||||
br.FinalizeBridges(w);
|
||||
}
|
||||
|
||||
static void ConvertBridgeToActor(World w, int i, int j)
|
||||
|
||||
@@ -99,9 +99,6 @@ namespace OpenRA
|
||||
|
||||
Timer.Time( "worldActor, players: {0}" );
|
||||
|
||||
Queries = new AllQueries( this );
|
||||
Timer.Time( "queries: {0}" );
|
||||
|
||||
foreach (var wlh in WorldActor.traits.WithInterface<ILoadWorldHook>())
|
||||
wlh.WorldLoaded(this);
|
||||
|
||||
@@ -252,6 +249,6 @@ namespace OpenRA
|
||||
}
|
||||
}
|
||||
|
||||
public readonly AllQueries Queries;
|
||||
public AllQueries Queries;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user