From a0a7be30228522f6c4c2e718550e7860cd69d824 Mon Sep 17 00:00:00 2001
From: Janek <development@superyu.xyz>
Date: Wed, 10 Apr 2024 22:54:50 +0200
Subject: [PATCH] fix 4
---
src/dma/mod.rs | 4 ++--
webradar/script.js | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/dma/mod.rs b/src/dma/mod.rs
index 288ab58..7f7d063 100755
--- a/src/dma/mod.rs
+++ b/src/dma/mod.rs
@@ -83,8 +83,8 @@ pub async fn run(radar_data: ArcRwlockRadarData, connector: Connector, pcileech_
let bomb_defuse_end: f32 = {
if bomb_can_defuse {
- if let Some(bomb_stamp) = data.bomb_defuse_stamp {
- (data.bomb_plant_timer - bomb_stamp.elapsed().as_secs_f32()) - data.bomb_defuse_length
+ if let Some(defuse_stamp) = data.bomb_defuse_stamp {
+ data.bomb_plant_timer - (data.bomb_defuse_length - defuse_stamp.elapsed().as_secs_f32())
} else {
0.0
}
diff --git a/webradar/script.js b/webradar/script.js
index 041f6be..5ae2fcf 100755
--- a/webradar/script.js
+++ b/webradar/script.js
@@ -227,10 +227,11 @@ function render() {
// Defuse stamp line
if (radarData.bombCanDefuse) {
+ console.log("radarData.bombDefuseEnd")
ctx.strokeStyle = "green"
ctx.beginPath()
- ctx.moveTo(130 + (maxWidth-2) * (radarData.bombDefuseLeft / 40), 16)
- ctx.lineTo(130 + (maxWidth-2) * (radarData.bombDefuseLeft / 40), 32)
+ ctx.moveTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 16)
+ ctx.lineTo(130 + (maxWidth-2) * (radarData.bombDefuseEnd / 40), 32)
ctx.stroke()
}
}