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

Merge pull request from superyu1337/development

Browse Source 
Merge bomb holder search fix
This commit is contained in:
Janek 2024-04-16 16:21:41 +02:00 committed by GitHub
commit 5d5fb900ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions

7
src/dma/mod.rs

@ -14,7 +14,7 @@ pub use context::Connector;
pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_device: String, skip_version: bool) -> anyhow::Result<()> { pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_device: String, skip_version: bool) -> anyhow::Result<()> {
let mut ctx = DmaCtx::setup(connector, pcileech_device, skip_version)?; let mut ctx = DmaCtx::setup(connector, pcileech_device, skip_version)?;
let mut data = CsData::default(); let mut data = CsData { recheck_bomb_holder: true, ..Default::default() };
// For read timing // For read timing
let mut last_bomb_dropped = false; let mut last_bomb_dropped = false;
@ -50,11 +50,10 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
data.update_bomb(&mut ctx); data.update_bomb(&mut ctx);
} }
if (!data.bomb_dropped && last_bomb_dropped) || !data.bomb_planted { if !data.bomb_dropped && last_bomb_dropped && !data.bomb_planted {
data.recheck_bomb_holder = true; data.recheck_bomb_holder = true;
} }
let bomb_defuse_timeleft: f32 = { let bomb_defuse_timeleft: f32 = {
if data.bomb_planted && !data.bomb_exploded && !data.bomb_defused { if data.bomb_planted && !data.bomb_exploded && !data.bomb_defused {
if let Some(bomb_stamp) = data.bomb_planted_stamp { if let Some(bomb_stamp) = data.bomb_planted_stamp {
@ -125,7 +124,7 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
if local_data.health > 0 { if local_data.health > 0 {
let has_bomb = { let has_bomb = {
if data.bomb_planted { if data.bomb_planted || data.bomb_dropped {
false false
} else if data.recheck_bomb_holder { } else if data.recheck_bomb_holder {
if local_data.team == Some(TeamID::T) && !data.bomb_dropped && !data.bomb_planted { if local_data.team == Some(TeamID::T) && !data.bomb_dropped && !data.bomb_planted {