Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert parameter re-ordering of flee() (included in commit 9b6616fc0) to be consistent with other action nodes.

Browse Source
This commit is contained in:
holychowders 2022-04-29 15:23:07 -05:00
parent a6955e5afb
commit f2b5ea600e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/sys/agent.rs
View File

@ -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);
}