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

fixed silly bug in World.Queries in OwnedBy[].WithTrait<>

Browse Source
This commit is contained in:
Bob
2010-02-11 00:49:43 +13:00
parent 839d77410e
commit b8022022ed
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRa.Game/Chrome.cs
View File

@@ -344,9 +344,9 @@ namespace OpenRa
AddButton(r, _ => { }); AddButton(r, _ => { });
} }
bool PaletteAvailable(int index) { return Game.LobbyInfo.Clients.All(c => c.PaletteIndex != index); } bool PaletteAvailable(int index) { return Game.LobbyInfo.Clients.All(c => c.PaletteIndex != index); }
bool SpawnPointAvailable(int index) { return (index == 0) || Game.LobbyInfo.Clients.All(c => c.SpawnPoint != index); } bool SpawnPointAvailable(int index) { return (index == 0) || Game.LobbyInfo.Clients.All(c => c.SpawnPoint != index); }
void CyclePalette(bool left) void CyclePalette(bool left)
{ {
var d = left ? +1 : Player.PlayerColors.Count() - 1; var d = left ? +1 : Player.PlayerColors.Count() - 1;

10
OpenRa.Game/World.cs
View File

@@ -171,16 +171,16 @@ namespace OpenRa
public CachedView<Actor, TraitPair<T>> WithTrait<T>() public CachedView<Actor, TraitPair<T>> WithTrait<T>()
{ {
return WithTraitInner<T>( world, hasTrait ); return WithTraitInner<T>( world.actors, hasTrait );
} }
static CachedView<Actor, TraitPair<T>> WithTraitInner<T>( World world, TypeDictionary hasTrait ) static CachedView<Actor, TraitPair<T>> WithTraitInner<T>( Set<Actor> set, TypeDictionary hasTrait )
{ {
var ret = hasTrait.GetOrDefault<CachedView<Actor, TraitPair<T>>>(); var ret = hasTrait.GetOrDefault<CachedView<Actor, TraitPair<T>>>();
if( ret != null ) if( ret != null )
return ret; return ret;
ret = new CachedView<Actor, TraitPair<T>>( ret = new CachedView<Actor, TraitPair<T>>(
world.actors, set,
x => x.traits.Contains<T>(), x => x.traits.Contains<T>(),
x => new TraitPair<T> { Actor = x, Trait = x.traits.Get<T>() } ); x => new TraitPair<T> { Actor = x, Trait = x.traits.Get<T>() } );
hasTrait.Add( ret ); hasTrait.Add( ret );
@@ -208,18 +208,16 @@ namespace OpenRa
public class OwnedByCachedView : CachedView<Actor, Actor> public class OwnedByCachedView : CachedView<Actor, Actor>
{ {
readonly World world;
readonly TypeDictionary hasTrait = new TypeDictionary(); readonly TypeDictionary hasTrait = new TypeDictionary();
public OwnedByCachedView( World world, Set<Actor> set, Func<Actor, bool> include ) public OwnedByCachedView( World world, Set<Actor> set, Func<Actor, bool> include )
: base( set, include, a => a ) : base( set, include, a => a )
{ {
this.world = world;
} }
public CachedView<Actor, TraitPair<T>> WithTrait<T>() public CachedView<Actor, TraitPair<T>> WithTrait<T>()
{ {
return WithTraitInner<T>( world, hasTrait ); return WithTraitInner<T>( this, hasTrait );
} }
} }
} }