From 57cc49dc1a2e1a8eb5ea9a8a1d6fd0444f029d2b Mon Sep 17 00:00:00 2001 From: Quaternions Date: Thu, 16 Jan 2025 06:35:36 -0800 Subject: [PATCH] explicitly reset and spawn instead of implicitly --- strafe-client/src/physics_worker.rs | 1 + strafe-client/src/session.rs | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/strafe-client/src/physics_worker.rs b/strafe-client/src/physics_worker.rs index c991381..9bc3921 100644 --- a/strafe-client/src/physics_worker.rs +++ b/strafe-client/src/physics_worker.rs @@ -66,6 +66,7 @@ pub fn new<'a>( }, Instruction::ChangeMap(complete_map)=>{ run_session_instruction!(ins.time,SessionInstruction::ChangeMap(&complete_map)); + run_session_instruction!(ins.time,SessionInstruction::Input(SessionInputInstruction::Mode(crate::session::ImplicitModeInstruction::ResetAndSpawn(strafesnet_common::gameplay_modes::ModeId::MAIN,strafesnet_common::gameplay_modes::StageId::FIRST)))); run_graphics_worker_instruction!(GraphicsInstruction::ChangeMap(complete_map)); }, } diff --git a/strafe-client/src/session.rs b/strafe-client/src/session.rs index 2edccfd..5d28f06 100644 --- a/strafe-client/src/session.rs +++ b/strafe-client/src/session.rs @@ -333,10 +333,6 @@ impl InstructionConsumer> for Session{ Instruction::ChangeMap(complete_map)=>{ self.clear_recording(); self.change_map(complete_map); - // ResetAndSpawn - run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Mode(ModeInstruction::Reset)); - run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Misc(MiscInstruction::SetSensitivity(self.user_settings().calculate_sensitivity()))); - run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Mode(ModeInstruction::Spawn(ModeId::MAIN,StageId::FIRST))); }, Instruction::Idle=>{ run_mouse_interpolator_instruction!(MouseInterpolatorInstruction::Idle);