diff --git a/common/src/comp/character_state.rs b/common/src/comp/character_state.rs index 6a3cd65939..3145f9d91a 100644 --- a/common/src/comp/character_state.rs +++ b/common/src/comp/character_state.rs @@ -222,7 +222,7 @@ impl CharacterState { std::mem::discriminant(self) == std::mem::discriminant(other) } - pub fn execute_behavior(&self, j: &JoinData) -> StateUpdate { + pub fn behavior(&self, j: &JoinData) -> StateUpdate { match &self { CharacterState::Idle => states::idle::Data.behavior(&j), CharacterState::Talk => states::talk::Data.behavior(&j), @@ -258,7 +258,7 @@ impl CharacterState { } } - pub fn handle_action(&self, j: &JoinData, action: ControlAction) -> StateUpdate { + pub fn handle_event(&self, j: &JoinData, action: ControlAction) -> StateUpdate { match &self { CharacterState::Idle => states::idle::Data.handle_event(&j, action), CharacterState::Talk => states::talk::Data.handle_event(&j, action), diff --git a/common/systems/src/character_behavior.rs b/common/systems/src/character_behavior.rs index 1b04200bbe..9b0b0958e9 100644 --- a/common/systems/src/character_behavior.rs +++ b/common/systems/src/character_behavior.rs @@ -269,7 +269,7 @@ impl<'a> System<'a> for Sys { &read_data.dt, &read_data.msm, ); - let state_update = j.character.handle_action(&j, action); + let state_update = j.character.handle_event(&j, action); ::publish_state_update( &mut join_struct, state_update, @@ -295,7 +295,7 @@ impl<'a> System<'a> for Sys { &read_data.msm, ); - let state_update = j.character.execute_behavior(&j); + let state_update = j.character.behavior(&j); ::publish_state_update( &mut join_struct, state_update,