renamed GameMode variants

This commit is contained in:
MaxOhn
2022-07-06 15:56:07 +02:00
parent a732d28b34
commit 970f9ff69f
17 changed files with 286 additions and 286 deletions
+1 -1
View File
@@ -195,7 +195,7 @@ impl Beatmap {
legacy_sort(&mut map.hit_objects);
map.mode = GameMode::MNA;
map.mode = GameMode::Mania;
map
}
+1 -1
View File
@@ -87,7 +87,7 @@ impl Beatmap {
map.hit_objects
.sort_by(|p1, p2| p1.partial_cmp(p2).unwrap_or(Ordering::Equal));
map.mode = GameMode::TKO;
map.mode = GameMode::Taiko;
map
}
+3 -3
View File
@@ -132,9 +132,9 @@ impl Beatmap {
}
match mode {
GameMode::STD | GameMode::CTB => Cow::Borrowed(self),
GameMode::TKO => Cow::Owned(self.convert_to_taiko()),
GameMode::MNA => Cow::Owned(self.convert_to_mania()),
GameMode::Osu | GameMode::Catch => Cow::Borrowed(self),
GameMode::Taiko => Cow::Owned(self.convert_to_taiko()),
GameMode::Mania => Cow::Owned(self.convert_to_mania()),
}
}
+5 -6
View File
@@ -1,20 +1,19 @@
/// The mode of a beatmap.
#[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)]
#[allow(clippy::upper_case_acronyms)]
pub enum GameMode {
/// osu!standard
STD = 0,
Osu = 0,
/// osu!taiko
TKO = 1,
Taiko = 1,
/// osu!catch
CTB = 2,
Catch = 2,
/// osu!mania
MNA = 3,
Mania = 3,
}
impl Default for GameMode {
#[inline]
fn default() -> Self {
Self::STD
Self::Osu
}
}