Compare commits

..

No commits in common. "6545f54cfcb75c7ff1b4904f74752c2589e9475e" and "5fa5b56e5a1a1679551a1d67058118d9957941c3" have entirely different histories.

5 changed files with 6 additions and 5 deletions

View File

@ -210,6 +210,7 @@ pub struct Game {
pub current_map: Option<Gd<Map>>,
pub world_ball: Option<Gd<Ball>>,
since_last_sync: f64,
pub goals: HashMap<u8, u16>,

View File

@ -1,6 +1,7 @@
use std::{
collections::VecDeque,
net::SocketAddr,
time::{Duration, SystemTime, UNIX_EPOCH},
time::{Duration, Instant, SystemTime, UNIX_EPOCH},
};
use godot::{

View File

@ -411,7 +411,7 @@ impl ICharacterBody3D for LocalPlayer {
scoreboard.set_visible(Input::singleton().is_action_pressed("scoreboard"));
}
if self.movement_dir.length_squared() > 0. && self.base().is_on_floor() && !self.is_dead {
if self.movement_dir.length_squared() > 0. && self.base().is_on_floor() {
if let Some(effects) = &mut self.effects {
effects.bind_mut().walk();
}

View File

@ -269,7 +269,6 @@ impl ICharacterBody3D for RemotePlayer {
if self.movement_dir.length_squared() > 0.
&& self.base().is_on_floor()
&& !self.is_dead
&& let Some(effects) = &mut self.effects
{
effects.bind_mut().walk();

View File

@ -7,9 +7,9 @@ use godot::{
use serde::{Deserialize, Serialize};
use crate::{
game_manager::Game,
game_manager::{Game, GameOption},
net::util::{cast_ray, shotgun_ray},
player::{DamageSource, shootable::Shootable},
player::{DamageSource, IPlayer, ball::Ball, shootable::Shootable},
};
pub trait Weapon {