Wizzard/radarflow2-kvm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Janek
2024-04-10 22:35:40 +02:00
parent 63867593ef
commit 120b30f5c7
3 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/comms.rs
View File

@@ -68,6 +68,9 @@ pub struct RadarData {
#[serde(rename = "bombDefuseTimeleft")]
bomb_defuse_timeleft: f32,
#[serde(rename = "bombDefuseLeft")]
bomb_defuse_left: f32,
#[serde(rename = "mapName")]
map_name: String,
@@ -79,8 +82,8 @@ pub struct RadarData {
}
impl RadarData {
pub fn new(ingame: bool, map_name: String, player_data: Vec<EntityData>, freq: usize, bomb_planted: bool, bomb_cannot_defuse: bool, bomb_defuse_timeleft: f32, bomb_exploded: bool, bomb_being_defused: bool, bomb_defuse_length: f32) -> RadarData {
RadarData { ingame, map_name, player_data, freq, bomb_planted, bomb_can_defuse: bomb_cannot_defuse, bomb_defuse_timeleft, bomb_exploded, bomb_being_defused, bomb_defuse_length }
pub fn new(ingame: bool, map_name: String, player_data: Vec<EntityData>, freq: usize, bomb_planted: bool, bomb_cannot_defuse: bool, bomb_defuse_timeleft: f32, bomb_exploded: bool, bomb_being_defused: bool, bomb_defuse_length: f32, bomb_defuse_left: f32) -> RadarData {
RadarData { ingame, map_name, player_data, freq, bomb_planted, bomb_can_defuse: bomb_cannot_defuse, bomb_defuse_timeleft, bomb_exploded, bomb_being_defused, bomb_defuse_length, bomb_defuse_left }
}
/// Returns empty RadarData, it's also the same data that gets sent to clients when not ingame
@@ -95,7 +98,8 @@ impl RadarData {
bomb_defuse_timeleft: 0.0,
bomb_exploded: false,
bomb_being_defused: false,
bomb_defuse_length: 0.0
bomb_defuse_length: 0.0,
bomb_defuse_left: 0.0
}
}
}

15
src/dma/mod.rs
View File

@@ -81,6 +81,18 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
}
};
let bomb_defuse_left: f32 = {
if bomb_can_defuse {
if let Some(bomb_stamp) = data.bomb_planted_stamp {
data.bomb_defuse_length - defuse_stamp.elapsed().as_secs_f32()
} else {
0.0
}
} else {
0.0
}
};
last_bomb_dropped = data.bomb_dropped;
last_bomb_planted = data.bomb_planted;
@@ -204,7 +216,8 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
bomb_defuse_timeleft,
data.bomb_exploded,
data.bomb_being_defused,
data.bomb_defuse_length
data.bomb_defuse_length,
bomb_defuse_left
);
} else {
let mut radar = radar_data.write().await;