From f2b5ea600e87ddefe8e129ef79274d9f643883ba Mon Sep 17 00:00:00 2001 From: holychowders Date: Fri, 29 Apr 2022 15:23:07 -0500 Subject: [PATCH] Revert parameter re-ordering of `flee()` (included in commit `9b6616fc0`) to be consistent with other action nodes. --- server/src/sys/agent.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs index 67318ea9bc..d02ef27e47 100644 --- a/server/src/sys/agent.rs +++ b/server/src/sys/agent.rs @@ -610,7 +610,7 @@ impl<'a> AgentData<'a> { self.cry_out(agent, event_emitter, read_data); agent.action_state.timer = 0.01; } else if within_flee_distance && has_opportunity_to_flee { - self.flee(tgt_pos, agent, controller, &read_data.terrain); + self.flee(agent, controller, tgt_pos, &read_data.terrain); agent.action_state.timer += read_data.dt.0; } else { agent.action_state.timer = 0.0; @@ -1455,9 +1455,9 @@ impl<'a> AgentData<'a> { fn flee( &self, - tgt_pos: &Pos, agent: &mut Agent, controller: &mut Controller, + tgt_pos: &Pos, terrain: &TerrainGrid, ) { if let Some(body) = self.body { @@ -2122,7 +2122,7 @@ impl<'a> AgentData<'a> { if !self.below_flee_health(agent) && follows_threatening_sounds { self.follow(agent, controller, &read_data.terrain, &sound_pos); } else if self.below_flee_health(agent) || !follows_threatening_sounds { - self.flee(&sound_pos, agent, controller, &read_data.terrain); + self.flee(agent, controller, &sound_pos, &read_data.terrain); } else { self.idle(agent, controller, read_data, rng); }