Fixed bug where unit would occasionally "disappear" or face in an odd direction.
This commit is contained in:
@@ -26,7 +26,7 @@ namespace OpenRa.Game.GameRules
|
||||
return float.Parse(x.Replace("%","")) * (x.Contains( '%' ) ? 0.01f : 1f);
|
||||
|
||||
else if (fieldType == typeof(string))
|
||||
return x;//.ToLowerInvariant();
|
||||
return x;
|
||||
|
||||
else if (fieldType.IsEnum)
|
||||
return Enum.Parse(fieldType, x);
|
||||
|
||||
@@ -59,14 +59,14 @@ namespace OpenRa.Game
|
||||
}
|
||||
|
||||
public void Build(SidebarItem item)
|
||||
{
|
||||
if (item != null)
|
||||
{
|
||||
if (item.techTreeItem.IsStructure)
|
||||
Game.controller.orderGenerator = new PlaceBuilding(Game.LocalPlayer,
|
||||
item.techTreeItem.tag.ToLowerInvariant());
|
||||
else
|
||||
Game.BuildUnit(Game.LocalPlayer, item.techTreeItem.tag.ToLowerInvariant());
|
||||
{
|
||||
if (item != null)
|
||||
{
|
||||
if (item.techTreeItem.IsStructure)
|
||||
Game.controller.orderGenerator = new PlaceBuilding(Game.LocalPlayer,
|
||||
item.techTreeItem.tag.ToLowerInvariant());
|
||||
else
|
||||
Game.BuildUnit(Game.LocalPlayer, item.techTreeItem.tag.ToLowerInvariant());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -22,21 +22,21 @@ namespace OpenRa.Game.Traits
|
||||
{
|
||||
this.self = self;
|
||||
fromCell = toCell;
|
||||
}
|
||||
|
||||
public void QueueAction( CurrentAction nextAction )
|
||||
{
|
||||
if( currentAction == null )
|
||||
{
|
||||
currentAction = nextAction;
|
||||
return;
|
||||
}
|
||||
var act = currentAction;
|
||||
while( act.NextAction != null )
|
||||
{
|
||||
act = act.NextAction;
|
||||
}
|
||||
act.NextAction = nextAction;
|
||||
}
|
||||
|
||||
public void QueueAction( CurrentAction nextAction )
|
||||
{
|
||||
if( currentAction == null )
|
||||
{
|
||||
currentAction = nextAction;
|
||||
return;
|
||||
}
|
||||
var act = currentAction;
|
||||
while( act.NextAction != null )
|
||||
{
|
||||
act = act.NextAction;
|
||||
}
|
||||
act.NextAction = nextAction;
|
||||
}
|
||||
|
||||
public void Tick(Actor self)
|
||||
@@ -48,25 +48,25 @@ namespace OpenRa.Game.Traits
|
||||
}
|
||||
|
||||
public Order Order(Actor self, int2 xy, bool lmb)
|
||||
{
|
||||
{
|
||||
if( lmb ) return null;
|
||||
|
||||
if (xy != toCell)
|
||||
return new MoveOrder(self, xy);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
public void Cancel(Actor self)
|
||||
{
|
||||
if (currentAction != null)
|
||||
currentAction.Cancel(self, this);
|
||||
}
|
||||
|
||||
public void Cancel(Actor self)
|
||||
{
|
||||
if (currentAction != null)
|
||||
currentAction.Cancel(self, this);
|
||||
}
|
||||
|
||||
public interface CurrentAction
|
||||
{
|
||||
{
|
||||
CurrentAction NextAction { get; set; }
|
||||
void Tick( Actor self, Mobile mobile );
|
||||
void Tick( Actor self, Mobile mobile );
|
||||
void Cancel( Actor self, Mobile mobile );
|
||||
}
|
||||
|
||||
@@ -91,12 +91,12 @@ namespace OpenRa.Game.Traits
|
||||
return;
|
||||
}
|
||||
Util.TickFacing( ref mobile.facing, desiredFacing, self.unitInfo.ROT );
|
||||
}
|
||||
|
||||
public void Cancel( Actor self, Mobile mobile )
|
||||
{
|
||||
desiredFacing = mobile.facing;
|
||||
NextAction = null;
|
||||
}
|
||||
|
||||
public void Cancel( Actor self, Mobile mobile )
|
||||
{
|
||||
desiredFacing = mobile.facing;
|
||||
NextAction = null;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -168,7 +168,6 @@ namespace OpenRa.Game.Traits
|
||||
{
|
||||
moveFraction -= moveFractionTotal;
|
||||
OnComplete( self, mobile );
|
||||
//mobile.fromCell = mobile.toCell;
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -177,7 +176,7 @@ namespace OpenRa.Game.Traits
|
||||
{
|
||||
self.CenterLocation = float2.Lerp( from, to, frac );
|
||||
if( moveFraction >= moveFractionTotal )
|
||||
mobile.facing = toFacing;
|
||||
mobile.facing = toFacing & 0xFF;
|
||||
else
|
||||
mobile.facing = ( fromFacing + ( toFacing - fromFacing ) * moveFraction / moveFractionTotal ) & 0xFF;
|
||||
}
|
||||
@@ -231,12 +230,12 @@ namespace OpenRa.Game.Traits
|
||||
self.CenterLocation = CenterOfCell( mobile.toCell );
|
||||
OnComplete = null;
|
||||
mobile.fromCell = mobile.toCell;
|
||||
}
|
||||
|
||||
public void Cancel( Actor self, Mobile mobile )
|
||||
{
|
||||
path.Clear();
|
||||
NextAction = null;
|
||||
}
|
||||
|
||||
public void Cancel( Actor self, Mobile mobile )
|
||||
{
|
||||
path.Clear();
|
||||
NextAction = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace OpenRa.Game.Traits
|
||||
var leftTurn = ( facing - desiredFacing ) & 0xFF;
|
||||
var rightTurn = ( desiredFacing - facing ) & 0xFF;
|
||||
if( Math.Min( leftTurn, rightTurn ) < rot )
|
||||
facing = desiredFacing;
|
||||
facing = desiredFacing & 0xFF;
|
||||
else if( rightTurn < leftTurn )
|
||||
facing = ( facing + rot ) & 0xFF;
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user