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

fix spawning

Browse Source
This commit is contained in:
Quaternions 2024-02-09 17:30:04 -08:00
parent 4e35feb5c2
commit 6c3e0ba84c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/physics.rs
View File

@ -1448,11 +1448,10 @@ fn run_teleport_behaviour(wormhole:&Option<gameplay_attributes::Wormhole>,models
//it matters which of these runs first, but I have not thought it through yet as it doesn't matter yet //it matters which of these runs first, but I have not thought it through yet as it doesn't matter yet
state.mode_state.clear(); state.mode_state.clear();
state.mode_state.set_stage_id(gameplay_modes::StageId::FIRST); state.mode_state.set_stage_id(gameplay_modes::StageId::FIRST);
let spawn_point={ let spawn_point=data.modes.get_mode(state.mode_state.get_mode_id()).and_then(|mode|
let mode=data.modes.get_mode(state.mode_state.get_mode_id()).unwrap(); //TODO: spawn at the bottom of the start zone plus the hitbox size
let stage=mode.get_stage(gameplay_modes::StageId::FIRST).unwrap(); Some(data.models.model(mode.get_start().into()).transform.vertex.translation)
data.models.model(stage.spawn().into()).transform.vertex.translation ).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.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time); (state.move_state,state.body.acceleration)=state.touching.get_move_state(&state.body,&data.models,&state.style,&data.hitbox_mesh,&state.camera,state.controls,&state.next_mouse,state.time);