From 4add77c4e01ee4ec56bac3be0c6de9c6295b8ad8 Mon Sep 17 00:00:00 2001 From: futile Date: Wed, 26 Mar 2025 11:04:44 +0000 Subject: [PATCH] move that thing --- src/features/empty_session.rs | 4 +++- src/gui.rs | 25 +++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/features/empty_session.rs b/src/features/empty_session.rs index 7b2e133..194c6b9 100644 --- a/src/features/empty_session.rs +++ b/src/features/empty_session.rs @@ -1,4 +1,4 @@ -use crate::gui::App; +use crate::{features, gui::App, util::Countdown}; use std::time::{Duration, Instant}; use sysinfo::System; use windows::Win32::{ @@ -13,6 +13,7 @@ const LEGACY: &str = "GTA5.exe"; pub struct EmptySession { pub enabled: bool, pub interval: Instant, + pub countdown: Countdown, } impl Default for EmptySession { @@ -20,6 +21,7 @@ impl Default for EmptySession { Self { enabled: true, interval: Instant::now(), + countdown: Countdown::new(features::empty_session::INTERVAL.as_secs() as usize), } } } diff --git a/src/gui.rs b/src/gui.rs index af3abc7..c932c1b 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -1,12 +1,9 @@ -use crate::{ - features::{ - self, - anti_afk::AntiAfk, - empty_session::EmptySession, - force_close::ForceClose, - launch::{Launch, Platform}, - }, - util::Countdown, +use crate::features::{ + self, + anti_afk::AntiAfk, + empty_session::EmptySession, + force_close::ForceClose, + launch::{Launch, Platform}, }; use eframe::egui; use std::time::{Duration, Instant}; @@ -20,7 +17,6 @@ pub struct App { pub launch: Launch, pub force_close: ForceClose, pub empty_session: EmptySession, - pub empty_session_countdown: Countdown, pub anti_afk: AntiAfk, } @@ -32,9 +28,6 @@ impl Default for App { game_handle: HANDLE::default(), launch: Launch::default(), force_close: ForceClose::default(), - empty_session_countdown: Countdown::new( - features::empty_session::INTERVAL.as_secs() as usize - ), empty_session: EmptySession::default(), anti_afk: AntiAfk::default(), } @@ -107,15 +100,15 @@ impl eframe::App for App { features::empty_session::activate(self); } if !self.empty_session.enabled { - self.empty_session_countdown.count(); + self.empty_session.countdown.count(); } else { - self.empty_session_countdown.reset(); + self.empty_session.countdown.reset(); } if self.empty_session.interval.elapsed() >= features::empty_session::INTERVAL { features::empty_session::deactivate(self); self.empty_session.enabled = true; } - ui.label(&self.empty_session_countdown.i_string); + ui.label(&self.empty_session.countdown.i_string); }); }); ui.checkbox(&mut self.anti_afk.enabled, "Anti AFK")