Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src-tauri/crates/db/src/legacy_migration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ fn migrate_single_save(

canonicalize_game_starting_xi_ids(&mut game);
player_identity::upgrade_game_player_identities(&mut game);
ofm_core::football_identity::upgrade_game_football_identities(&mut game);
ofm_core::identity_upgrade::upgrade_game_football_identities(&mut game);

save_manager.create_save(&game, &row.name)
}
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/crates/db/src/save_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ impl SaveManager {
needs_resave = true;
}

if ofm_core::football_identity::upgrade_game_football_identities(&mut game) {
if ofm_core::identity_upgrade::upgrade_game_football_identities(&mut game) {
info!(
"[save_manager] upgraded football identity fields for save {}",
save_id
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/crates/ofm_core/src/game.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ impl Game {
champion_masteries: vec![],
champion_patch: ChampionPatchState::default(),
};
crate::football_identity::upgrade_game_football_identities(&mut game);
crate::identity_upgrade::upgrade_game_football_identities(&mut game);
crate::season_context::refresh_game_context(&mut game);
game
}
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/crates/ofm_core/src/generator/world_io.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::definitions::{WorldData, WorldDatabaseInfo};
/// If `data_dir` is provided, tries to load definition files from that directory.
pub fn generate_world_data(data_dir: Option<&std::path::Path>) -> WorldData {
let (mut teams, mut players, mut staff) = super::generate_world(data_dir);
crate::football_identity::upgrade_world_football_identities(
crate::identity_upgrade::upgrade_world_football_identities(
&mut teams,
&mut players,
&mut staff,
Expand All @@ -26,7 +26,7 @@ pub fn generate_world_data(data_dir: Option<&std::path::Path>) -> WorldData {
pub fn load_world_from_json(json: &str) -> Result<WorldData, String> {
let mut world: WorldData =
serde_json::from_str(json).map_err(|e| format!("Failed to parse world database: {}", e))?;
crate::football_identity::upgrade_world_football_identities(
crate::identity_upgrade::upgrade_world_football_identities(
&mut world.teams,
&mut world.players,
&mut world.staff,
Expand All @@ -37,7 +37,7 @@ pub fn load_world_from_json(json: &str) -> Result<WorldData, String> {
/// Serialise a `WorldData` to a pretty-printed JSON string.
pub fn export_world_to_json(world: &WorldData) -> Result<String, String> {
let mut normalized = world.clone();
crate::football_identity::upgrade_world_football_identities(
crate::identity_upgrade::upgrade_world_football_identities(
&mut normalized.teams,
&mut normalized.players,
&mut normalized.staff,
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/crates/ofm_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub mod delegated_renewals;
pub mod end_of_season;
pub mod finances;
pub mod firing;
pub mod football_identity;
pub mod identity_upgrade;
pub mod game;
pub mod generator;
pub mod job_offers;
Expand Down
Loading