Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Source/Vehicles/Gizmo/Command_CooldownAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ public override void FireTurret(VehicleTurret turret)
}
}

public void HaltTurret()
{
turret.SetTarget(LocalTargetInfo.Invalid);
}

public override GizmoResult GizmoOnGUI(Vector2 topLeft, float maxWidth, GizmoRenderParms parms)
{
// We need to do a lazy init since turret field is populated by object initializer
Expand Down Expand Up @@ -142,7 +147,7 @@ public override GizmoResult GizmoOnGUI(Vector2 topLeft, float maxWidth, GizmoRen
}
return new GizmoResult(GizmoState.Mouseover);
}
turret.SetTarget(LocalTargetInfo.Invalid);
HaltTurret();
return new GizmoResult(GizmoState.Clear);
}

Expand Down Expand Up @@ -389,4 +394,4 @@ static string TextLabel(int amount)
return "VF_SetReloadLevel".Translate(amount);
}
}
}
}
16 changes: 9 additions & 7 deletions Source/Vehicles/Gizmo/Command_TargeterCooldownAction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@ public override void FireTurret(VehicleTurret turret)
{
if (turret.ReloadTicks <= 0)
{
turret.SetTarget(LocalTargetInfo.Invalid);
TurretTargeter.BeginTargeting(targetingParams, delegate(LocalTargetInfo target)
{
turret.SetTarget(target);
turret.ResetPrefireTimer();
}, turret);
HaltTurret();
TurretTargeter.BeginTargeting(targetingParams, CommitTarget, turret);
}
}
}

public void CommitTarget(LocalTargetInfo target)
{
turret.SetTarget(target);
turret.ResetPrefireTimer();
}
}