Refactoring to remove static Rules & SequenceProvider

This commit is contained in:
Pavlos Touboulidis
2014-05-05 02:43:08 +03:00
parent c68427eaa6
commit 63ec6d60e7
114 changed files with 914 additions and 615 deletions

View File

@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Cnc
{
this.info = info;
health = self.Trait<Health>();
weapon = Rules.Weapons[info.Weapon.ToLowerInvariant()];
weapon = self.World.Map.Rules.Weapons[info.Weapon.ToLowerInvariant()];
}
public void AddedToWorld(Actor self)

View File

@@ -40,7 +40,7 @@ namespace OpenRA.Mods.D2k
{
foreach (var name in info.Weapons)
{
var wep = Rules.Weapons[name];
var wep = self.World.Map.Rules.Weapons[name];
var pieces = self.World.SharedRandom.Next(info.Pieces[0], info.Pieces[1]);
var range = self.World.SharedRandom.Next(info.Range[0].Range, info.Range[1].Range);