hodasemi/rFactor2_vk_hud
1
0
Fork 0
Code Issues 2 Pull requests 1 Actions Projects Releases 1 Wiki Activity

Add phase case for Testday & remove dc'd players

Browse source
This commit is contained in:
hodasemi 2023-01-19 15:36:56 +01:00
parent 62a5364500
commit 1b029f4b96
4 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/overlay/elements/leaderboard/mod.rs
View file

@ -128,9 +128,6 @@ impl LeaderBoard {
} }
} }
// TODO: when people disconnect there needs to be a remove function
// vehicle_scorings.len() != self.leaderboard_entries.len()
write_log!("create entries"); write_log!("create entries");
// check if entry count in grid is the same as the gathered entries // check if entry count in grid is the same as the gathered entries
@ -145,6 +142,16 @@ impl LeaderBoard {
entry.snippet().set_visibility(false)?; entry.snippet().set_visibility(false)?;
} }
true
}
// there are more entries in leaderboard when someone leaves and ID doesn't get reused
else if self.leaderboard_entries.len() > vehicle_scorings.len() {
self.leaderboard_entries.retain(|entry| {
vehicle_scorings
.iter()
.any(|scoring| scoring.mID == entry.id())
});
true true
} else { } else {
false false
@ -265,13 +272,12 @@ impl UiOverlay for LeaderBoard {}
impl DataReceiver for LeaderBoard { impl DataReceiver for LeaderBoard {
fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> { fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> {
match phase { match phase {
GamePhase::Practice | GamePhase::Qualifying => { GamePhase::Practice | GamePhase::Qualifying | GamePhase::TestDay => {
for entry in self.leaderboard_entries.iter_mut() { for entry in self.leaderboard_entries.iter_mut() {
entry.update_best_lap(-1.0)?; entry.update_best_lap(-1.0)?;
} }
self.leaderboard.enable()?; self.leaderboard.enable()?;
self.deltaboard.enable()?;
} }
GamePhase::Race => { GamePhase::Race => {
@ -294,7 +300,9 @@ impl DataReceiver for LeaderBoard {
fn update_for_phase(&self, phase: GamePhase) -> bool { fn update_for_phase(&self, phase: GamePhase) -> bool {
match phase { match phase {
GamePhase::Practice | GamePhase::Qualifying | GamePhase::Race => true, GamePhase::Practice | GamePhase::Qualifying | GamePhase::Race | GamePhase::TestDay => {
true
}
_ => false, _ => false,
} }
} }
@ -307,7 +315,7 @@ impl DataReceiver for LeaderBoard {
write_log!("=================== leader board: scoring update ==================="); write_log!("=================== leader board: scoring update ===================");
match phase { match phase {
GamePhase::Practice | GamePhase::Qualifying => { GamePhase::Practice | GamePhase::Qualifying | GamePhase::TestDay => {
self.quali_leaderboard(vehicle_scorings)?; self.quali_leaderboard(vehicle_scorings)?;
} }

8
src/overlay/elements/pedals/mod.rs
View file

@ -237,7 +237,7 @@ impl UiOverlay for Pedals {}
impl DataReceiver for Pedals { impl DataReceiver for Pedals {
fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> { fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> {
match phase { match phase {
GamePhase::None | GamePhase::TestDay => { GamePhase::None => {
self.enable = false; self.enable = false;
self.gui.disable()?; self.gui.disable()?;
} }
@ -252,10 +252,8 @@ impl DataReceiver for Pedals {
fn update_for_phase(&self, phase: GamePhase) -> bool { fn update_for_phase(&self, phase: GamePhase) -> bool {
match phase { match phase {
GamePhase::Practice | GamePhase::Qualifying | GamePhase::Race | GamePhase::Warmup => { GamePhase::None => false,
true _ => true,
}
_ => false,
} }
} }

8
src/overlay/elements/radar/mod.rs
View file

@ -274,7 +274,7 @@ impl UiOverlay for Radar {}
impl DataReceiver for Radar { impl DataReceiver for Radar {
fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> { fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> {
match phase { match phase {
GamePhase::None | GamePhase::TestDay => self.enable = false, GamePhase::None => self.enable = false,
_ => self.enable = true, _ => self.enable = true,
} }
@ -283,10 +283,8 @@ impl DataReceiver for Radar {
fn update_for_phase(&self, phase: GamePhase) -> bool { fn update_for_phase(&self, phase: GamePhase) -> bool {
match phase { match phase {
GamePhase::Practice | GamePhase::Qualifying | GamePhase::Race | GamePhase::Warmup => { GamePhase::None => false,
true _ => true,
}
_ => false,
} }
} }

2
src/overlay/elements/watermark/mod.rs
View file

@ -28,7 +28,7 @@ impl UiOverlay for Watermark {}
impl DataReceiver for Watermark { impl DataReceiver for Watermark {
fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> { fn game_phase_change(&mut self, phase: GamePhase) -> Result<()> {
match phase { match phase {
GamePhase::TestDay => self.gui.enable()?, GamePhase::None => self.gui.enable()?,
_ => self.gui.disable()?, _ => self.gui.disable()?,
} }