aidan9382/strafe-client
1
Fork 0
forked from StrafesNET/strafe-client
Code Pull Requests Activity

fixup double references

Browse Source
This commit is contained in:
Quaternions 2024-02-22 01:15:33 -08:00
parent b0d8f2e09a
commit b6e7ce4e25
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/physics.rs
View File

@ -978,7 +978,7 @@ impl PhysicsState {
match self.move_state.get_walk_state(){ match self.move_state.get_walk_state(){
//did you stop touching the thing you were walking on? //did you stop touching the thing you were walking on?
Some(walk_state)=>if !self.touching.contacts.contains(&walk_state.contact){ Some(walk_state)=>if !self.touching.contacts.contains(&walk_state.contact){
self.set_move_state(&data,MoveState::Air); self.set_move_state(data,MoveState::Air);
}, },
None=>self.apply_enum_and_body(data), None=>self.apply_enum_and_body(data),
} }
@ -1351,7 +1351,7 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,models
//ladder walkstate //ladder walkstate
let (gravity,target_velocity)=ladder_things(ladder_settings,&contact,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state); let (gravity,target_velocity)=ladder_things(ladder_settings,&contact,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
let walk_state=ContactMoveState::ladder(ladder_settings,&state.body,gravity,target_velocity,contact); let walk_state=ContactMoveState::ladder(ladder_settings,&state.body,gravity,target_velocity,contact);
state.set_move_state(&data,MoveState::Ladder(walk_state)); state.set_move_state(data,MoveState::Ladder(walk_state));
}, },
Some(gameplay_attributes::ContactingBehaviour::NoJump)=>todo!("nyi"), Some(gameplay_attributes::ContactingBehaviour::NoJump)=>todo!("nyi"),
None=>if let Some(walk_settings)=&state.style.walk{ None=>if let Some(walk_settings)=&state.style.walk{
@ -1359,7 +1359,7 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,models
//ground //ground
let (gravity,target_velocity)=ground_things(walk_settings,&contact,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state); let (gravity,target_velocity)=ground_things(walk_settings,&contact,&state.touching,&data.models,&data.hitbox_mesh,&state.style,&state.camera,&state.input_state);
let walk_state=ContactMoveState::ground(walk_settings,&state.body,gravity,target_velocity,contact); let walk_state=ContactMoveState::ground(walk_settings,&state.body,gravity,target_velocity,contact);
state.set_move_state(&data,MoveState::Walk(walk_state)); state.set_move_state(data,MoveState::Walk(walk_state));
} }
}, },
} }
@ -1427,7 +1427,7 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,models
match state.move_state.get_walk_state(){ match state.move_state.get_walk_state(){
//did you stop touching the thing you were walking on? //did you stop touching the thing you were walking on?
Some(walk_state)=>if walk_state.contact==contact{ Some(walk_state)=>if walk_state.contact==contact{
state.set_move_state(&data,MoveState::Air); state.set_move_state(data,MoveState::Air);
}, },
None=>state.apply_enum_and_body(data), None=>state.apply_enum_and_body(data),
} }
@ -1523,16 +1523,16 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,models
).unwrap_or(Planar64Vec3::ZERO); ).unwrap_or(Planar64Vec3::ZERO);
set_position(&mut state.body,&mut state.touching,spawn_point); set_position(&mut state.body,&mut state.touching,spawn_point);
set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,Planar64Vec3::ZERO); set_velocity(&mut state.body,&state.touching,&data.models,&data.hitbox_mesh,Planar64Vec3::ZERO);
state.set_move_state(&data,MoveState::Air); state.set_move_state(data,MoveState::Air);
b_refresh_walk_target=false; b_refresh_walk_target=false;
}, },
PhysicsInputInstruction::PracticeFly=>{ PhysicsInputInstruction::PracticeFly=>{
match &state.move_state{ match &state.move_state{
MoveState::Fly=>{ MoveState::Fly=>{
state.set_move_state(&data,MoveState::Air); state.set_move_state(data,MoveState::Air);
}, },
_=>{ _=>{
state.set_move_state(&data,MoveState::Fly); state.set_move_state(data,MoveState::Fly);
}, },
} }
b_refresh_walk_target=false; b_refresh_walk_target=false;