mirror of
https://github.com/kuhyx/WUT_Computer_Science.git
synced 2026-11-20 23:12:27 +01:00
made usage of adding/removing soldiers to squad easier
+ now only add/remove soldier to squad once and this
This commit is contained in:
parent
ce3d7d69ee
commit
93ba29703e
@ -37,7 +37,6 @@ public class SquadManager : MonoBehaviour
|
|||||||
if (soldier.GetOwnTeam() == squad.GetOwnTeam())
|
if (soldier.GetOwnTeam() == squad.GetOwnTeam())
|
||||||
{
|
{
|
||||||
squad.AddSoldierToSquad(soldier);
|
squad.AddSoldierToSquad(soldier);
|
||||||
soldier.OnDeath.AddListener(squad.RemoveSoldierFromSquad);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
enabled = false;
|
enabled = false;
|
||||||
|
|||||||
@ -40,11 +40,13 @@ public class Squad : MonoBehaviour
|
|||||||
public void AddSoldierToSquad(Entity soldier)
|
public void AddSoldierToSquad(Entity soldier)
|
||||||
{
|
{
|
||||||
soldiers.Add(soldier);
|
soldiers.Add(soldier);
|
||||||
|
soldier.OnDeath.AddListener(RemoveSoldierFromSquad);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveSoldierFromSquad(Entity soldier)
|
public void RemoveSoldierFromSquad(Entity soldier)
|
||||||
{
|
{
|
||||||
soldiers.Remove(soldier);
|
soldiers.Remove(soldier);
|
||||||
|
soldier.OnDeath.RemoveListener(RemoveSoldierFromSquad);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
@ -52,12 +54,12 @@ public class Squad : MonoBehaviour
|
|||||||
TickSystem.OnTick += HandleTick;
|
TickSystem.OnTick += HandleTick;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start()
|
private void OnDestroy()
|
||||||
{
|
{
|
||||||
|
TickSystem.OnTick -= HandleTick;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void HandleTick(TickSystem.OnTickEventArgs eventArgs)
|
private void HandleTick(TickSystem.OnTickEventArgs eventArgs)
|
||||||
{// pass a single order to all soldiers
|
{// pass a single order to all soldiers
|
||||||
if (orders.Count < 1)
|
if (orders.Count < 1)
|
||||||
return; // for now nothing to do here
|
return; // for now nothing to do here
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user