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

renaming methods to match the names of the methods called within

Browse Source
This commit is contained in:
Thomas Kosel
2021-07-29 22:55:58 +02:00
parent 0b07b14093
commit 005c33bb28
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/comp/character_state.rs
View File

@ -222,7 +222,7 @@ impl CharacterState {
std::mem::discriminant(self) == std::mem::discriminant(other) 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 { match &self {
CharacterState::Idle => states::idle::Data.behavior(&j), CharacterState::Idle => states::idle::Data.behavior(&j),
CharacterState::Talk => states::talk::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 { match &self {
CharacterState::Idle => states::idle::Data.handle_event(&j, action), CharacterState::Idle => states::idle::Data.handle_event(&j, action),
CharacterState::Talk => states::talk::Data.handle_event(&j, action), CharacterState::Talk => states::talk::Data.handle_event(&j, action),

4
common/systems/src/character_behavior.rs
View File

@ -269,7 +269,7 @@ impl<'a> System<'a> for Sys {
&read_data.dt, &read_data.dt,
&read_data.msm, &read_data.msm,
); );
let state_update = j.character.handle_action(&j, action); let state_update = j.character.handle_event(&j, action);
<Sys>::publish_state_update( <Sys>::publish_state_update(
&mut join_struct, &mut join_struct,
state_update, state_update,
@ -295,7 +295,7 @@ impl<'a> System<'a> for Sys {
&read_data.msm, &read_data.msm,
); );
let state_update = j.character.execute_behavior(&j); let state_update = j.character.behavior(&j);
<Sys>::publish_state_update( <Sys>::publish_state_update(
&mut join_struct, &mut join_struct,
state_update, state_update,