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

fix #1052; tidy up *Init; route initial turret facing for husks through new TurretFacingInit

Browse Source
This commit is contained in:
Chris Forbes
2011-07-28 23:07:14 +12:00
parent 096fe7759c
commit 2bf7cb1496
7 changed files with 84 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenRA.Mods.RA/Turreted.cs
View File

@@ -22,17 +22,26 @@ namespace OpenRA.Mods.RA
public class Turreted : ITick, ISync
{
[Sync]
public int turretFacing = 0;
[Sync] public int turretFacing = 0;
public int? desiredFacing;
TurretedInfo info;
IFacing facing;
public static int GetInitialTurretFacing(ActorInitializer init, int def)
{
if (init.Contains<TurretFacingInit>())
return init.Get<TurretFacingInit,int>();
if (init.Contains<FacingInit>())
return init.Get<FacingInit,int>();
return def;
}
public Turreted(ActorInitializer init, TurretedInfo info)
{
this.info = info;
turretFacing = info.InitialFacing;
turretFacing = init.Contains<FacingInit>() ? init.Get<FacingInit,int>() : info.InitialFacing;
turretFacing = GetInitialTurretFacing(init, info.InitialFacing);
facing = init.self.TraitOrDefault<IFacing>();
}