Royiex/strafe-client-jed
1
Fork 0
forked from StrafesNET/strafe-project
Code Pull Requests 1 Activity

lol idk #1

Open
Quaternions wants to merge 826 commits from StrafesNET/strafe-project:master into master
pull from: StrafesNET/strafe-project:master
merge into: Royiex:master
Conversation 0 Commits 826 Files Changed 206 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b45b92c627 - Show all commits

5
lib/snf/src/newtypes/physics.rs
View File

@ -88,6 +88,8 @@ pub enum Instruction{
PracticeFly, PracticeFly,
#[brw(magic=14u8)] #[brw(magic=14u8)]
SetSensitivity(super::integer::Ratio64Vec2), SetSensitivity(super::integer::Ratio64Vec2),
#[brw(magic=255u8)]
Idle,
} }
#[derive(Debug)] #[derive(Debug)]
pub enum InstructionConvert{ pub enum InstructionConvert{
@ -122,6 +124,7 @@ impl TryInto<strafesnet_common::physics::Instruction> for Instruction{
)), )),
Instruction::PracticeFly=>strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::PracticeFly), Instruction::PracticeFly=>strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::PracticeFly),
Instruction::SetSensitivity(sensitivity)=>strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::SetSensitivity(sensitivity.try_into()?)), Instruction::SetSensitivity(sensitivity)=>strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::SetSensitivity(sensitivity.try_into()?)),
Instruction::Idle=>strafesnet_common::physics::Instruction::Idle,
}) })
} }
} }
@ -147,7 +150,7 @@ impl TryFrom<strafesnet_common::physics::Instruction> for Instruction{
)), )),
strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::PracticeFly)=>Ok(Instruction::PracticeFly), strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::PracticeFly)=>Ok(Instruction::PracticeFly),
strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::SetSensitivity(sensitivity))=>Ok(Instruction::SetSensitivity(sensitivity.into())), strafesnet_common::physics::Instruction::Misc(strafesnet_common::physics::MiscInstruction::SetSensitivity(sensitivity))=>Ok(Instruction::SetSensitivity(sensitivity.into())),
strafesnet_common::physics::Instruction::Idle=>Err(InstructionConvert::DropInstruction), strafesnet_common::physics::Instruction::Idle=>Ok(Instruction::Idle),
} }
} }
} }