This commit is contained in:
yuni 2024-04-05 23:42:02 +02:00
parent a0514de123
commit 91875436bc

View file

@ -7,7 +7,6 @@ use crate::{actor, audio, camera, chat, commands, effects, hud, nature, settings
pub const ENGINE_SPEED_FACTOR: f32 = 30.0; pub const ENGINE_SPEED_FACTOR: f32 = 30.0;
const MAX_TRANSMISSION_DISTANCE: f32 = 60.0; const MAX_TRANSMISSION_DISTANCE: f32 = 60.0;
const MAX_INTERACT_DISTANCE: f32 = 30.0; const MAX_INTERACT_DISTANCE: f32 = 30.0;
const NO_RIDE: u32 = 0;
pub struct ActorPlugin; pub struct ActorPlugin;
impl Plugin for ActorPlugin { impl Plugin for ActorPlugin {
@ -47,7 +46,6 @@ pub struct Actor {
pub id: String, pub id: String,
pub name: Option<String>, pub name: Option<String>,
pub m: f32, // mass pub m: f32, // mass
pub inside_entity: u32,
pub camdistance: f32, pub camdistance: f32,
} }
impl Default for Actor { impl Default for Actor {
@ -56,7 +54,6 @@ impl Default for Actor {
id: "".to_string(), id: "".to_string(),
name: None, name: None,
m: 100.0, m: 100.0,
inside_entity: NO_RIDE,
camdistance: 15.0, camdistance: 15.0,
} }
} }
@ -81,8 +78,6 @@ impl Default for HitPoints {
#[derive(Component)] pub struct Player; // Attached to the suit of the player #[derive(Component)] pub struct Player; // Attached to the suit of the player
#[derive(Component)] pub struct PlayerDrivesThis; // Attached to the entered vehicle #[derive(Component)] pub struct PlayerDrivesThis; // Attached to the entered vehicle
#[derive(Component)] pub struct PlayerCamera; // Attached to the actor to use as point of view #[derive(Component)] pub struct PlayerCamera; // Attached to the actor to use as point of view
#[derive(Component)] pub struct PlayerInConversation;
#[derive(Component)] pub struct InConversationWithPlayer;
#[derive(Component)] pub struct ActorEnteringVehicle; #[derive(Component)] pub struct ActorEnteringVehicle;
#[derive(Component)] pub struct ActorVehicleBeingEntered; #[derive(Component)] pub struct ActorVehicleBeingEntered;
#[derive(Component)] pub struct WantsMaxRotation(pub f64); #[derive(Component)] pub struct WantsMaxRotation(pub f64);