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

add player parameter to ReinforceFromSea in prep for using it elsewhere

Browse Source
This commit is contained in:
Chris Forbes
2011-07-17 17:10:52 +12:00
parent 8221b8acca
commit 2ac6ccd3a4
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
View File

@@ -131,7 +131,8 @@ namespace OpenRA.Mods.Cnc
Actors["lstStart"].Location, Actors["lstStart"].Location,
Actors["lstEnd"].Location, Actors["lstEnd"].Location,
new int2(53,53), new int2(53,53),
new string[] {"e1","e1","e1"}); new string[] {"e1","e1","e1"},
Players["GoodGuy"]);
} }
if (ticks == 25*15) if (ticks == 25*15)
@@ -140,7 +141,8 @@ namespace OpenRA.Mods.Cnc
Actors["lstStart"].Location, Actors["lstStart"].Location,
Actors["lstEnd"].Location, Actors["lstEnd"].Location,
new int2(53,53), new int2(53,53),
new string[] {"e1","e1","e1"}); new string[] {"e1","e1","e1"},
Players["GoodGuy"]);
} }
if (ticks == 25*30) if (ticks == 25*30)
@@ -149,7 +151,8 @@ namespace OpenRA.Mods.Cnc
Actors["lstStart"].Location, Actors["lstStart"].Location,
Actors["lstEnd"].Location, Actors["lstEnd"].Location,
new int2(53,53), new int2(53,53),
new string[] {"jeep"}); new string[] {"jeep"},
Players["GoodGuy"]);
} }
if (ticks == 25*60) if (ticks == 25*60)
@@ -158,7 +161,8 @@ namespace OpenRA.Mods.Cnc
Actors["lstStart"].Location, Actors["lstStart"].Location,
Actors["lstEnd"].Location, Actors["lstEnd"].Location,
new int2(53,53), new int2(53,53),
new string[] {"jeep"}); new string[] {"jeep"},
Players["GoodGuy"]);
} }
ticks++; ticks++;
@@ -173,7 +177,7 @@ namespace OpenRA.Mods.Cnc
self.QueueActivity(new CallFunc(() => SetGunboatPath())); self.QueueActivity(new CallFunc(() => SetGunboatPath()));
} }
void ReinforceFromSea(World world, int2 startPos, int2 endPos, int2 unload, string[] items) void ReinforceFromSea(World world, int2 startPos, int2 endPos, int2 unload, string[] items, Player player)
{ {
world.AddFrameEndTask(w => world.AddFrameEndTask(w =>
{ {
@@ -182,7 +186,7 @@ namespace OpenRA.Mods.Cnc
var a = w.CreateActor("lst", new TypeDictionary var a = w.CreateActor("lst", new TypeDictionary
{ {
new LocationInit( startPos ), new LocationInit( startPos ),
new OwnerInit( Players["GoodGuy"] ), new OwnerInit( player ),
new FacingInit( 0 ), new FacingInit( 0 ),
}); });
@@ -191,7 +195,7 @@ namespace OpenRA.Mods.Cnc
foreach (var i in items) foreach (var i in items)
cargo.Load(a, world.CreateActor(false, i.ToLowerInvariant(), new TypeDictionary cargo.Load(a, world.CreateActor(false, i.ToLowerInvariant(), new TypeDictionary
{ {
new OwnerInit( Players["GoodGuy"] ), new OwnerInit( player ),
new FacingInit( 0 ), new FacingInit( 0 ),
})); }));