From b6300bcb0be094cb547ccc10cbabbb8892da17aa Mon Sep 17 00:00:00 2001
From: Wizzard <rich@bandaholics.cash>
Date: Mon, 17 Mar 2025 15:51:47 -0400
Subject: [PATCH] Clean up unused things
---
src/comms.rs | 28 ----------------------------
src/dma/mod.rs | 4 ++--
src/websocket.rs | 2 +-
3 files changed, 3 insertions(+), 31 deletions(-)
diff --git a/src/comms.rs b/src/comms.rs
index 6f9c011..bb265c3 100755
--- a/src/comms.rs
+++ b/src/comms.rs
@@ -33,22 +33,6 @@ pub struct PlayerData {
impl PlayerData {
pub fn new(pos: Vec3, yaw: f32, player_type: PlayerType, has_bomb: bool, has_awp: bool,
- is_scoped: bool, player_name: String, weapon_id: i16, health: u32) -> PlayerData {
- PlayerData {
- pos,
- yaw,
- player_type,
- has_bomb,
- has_awp,
- is_scoped,
- player_name,
- weapon_id,
- money: 0,
- health
- }
- }
-
- pub fn new_with_money(pos: Vec3, yaw: f32, player_type: PlayerType, has_bomb: bool, has_awp: bool,
is_scoped: bool, player_name: String, weapon_id: i16, money: i32, health: u32) -> PlayerData {
PlayerData {
pos,
@@ -63,14 +47,6 @@ impl PlayerData {
health
}
}
-
- pub fn get_pos(&self) -> &Vec3 {
- &self.pos
- }
-
- pub fn get_player_name(&self) -> &str {
- &self.player_name
- }
}
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -191,10 +167,6 @@ impl RadarData {
pub fn get_entities(&self) -> &Vec<EntityData> {
&self.player_data
}
-
- pub fn set_entities(&mut self, entities: Vec<EntityData>) {
- self.player_data = entities;
- }
}
unsafe impl Send for RadarData {}
diff --git a/src/dma/mod.rs b/src/dma/mod.rs
index 59f4b6c..cffda20 100755
--- a/src/dma/mod.rs
+++ b/src/dma/mod.rs
@@ -196,7 +196,7 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
entity_data.push(
EntityData::Player(
- PlayerData::new_with_money(
+ PlayerData::new(
local_data.pos,
local_data.yaw,
PlayerType::Local,
@@ -238,7 +238,7 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
entity_data.push(
EntityData::Player(
- PlayerData::new_with_money(
+ PlayerData::new(
player_data.pos,
player_data.yaw,
player_type,
diff --git a/src/websocket.rs b/src/websocket.rs
index f781d9c..4b2a82c 100644
--- a/src/websocket.rs
+++ b/src/websocket.rs
@@ -10,7 +10,7 @@ use std::io::Write;
use tokio::sync::{RwLock, Mutex};
use tower_http::services::ServeDir;
-use crate::comms::{RadarData, ArcRwlockRadarData, EntityData};
+use crate::comms::{RadarData};
struct ClientState {
last_entity_count: usize,