diff options
| -rw-r--r-- | src-tauri/src/main.rs | 1 | ||||
| -rw-r--r-- | src-tauri/src/northstar/install.rs | 1 | ||||
| -rw-r--r-- | src-tauri/src/northstar/mod.rs | 10 | ||||
| -rw-r--r-- | src-vue/src/i18n/lang/en.json | 1 | ||||
| -rw-r--r-- | src-vue/src/plugins/store.ts | 10 | ||||
| -rw-r--r-- | src-vue/src/utils/GameInstall.ts | 1 | ||||
| -rw-r--r-- | src-vue/src/views/SettingsView.vue | 19 |
7 files changed, 40 insertions, 3 deletions
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 1067f5d3..21408ff8 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -467,6 +467,7 @@ pub enum InstallType { #[derive(Serialize, Deserialize, Debug, Clone)] pub struct GameInstall { pub game_path: String, + pub launch_parameters: String, pub install_type: InstallType, } diff --git a/src-tauri/src/northstar/install.rs b/src-tauri/src/northstar/install.rs index c77fd538..28366738 100644 --- a/src-tauri/src/northstar/install.rs +++ b/src-tauri/src/northstar/install.rs @@ -190,6 +190,7 @@ pub fn find_game_install_location() -> Result<GameInstall, String> { // println!("{:#?}", app); let game_install = GameInstall { game_path: app.path.to_str().unwrap().to_string(), + launch_parameters: "".to_string(), install_type: InstallType::STEAM, }; return Ok(game_install); diff --git a/src-tauri/src/northstar/mod.rs b/src-tauri/src/northstar/mod.rs index bf55603b..6d0e26d2 100644 --- a/src-tauri/src/northstar/mod.rs +++ b/src-tauri/src/northstar/mod.rs @@ -112,8 +112,14 @@ pub fn launch_northstar( || matches!(game_install.install_type, InstallType::UNKNOWN)) { let ns_exe_path = format!("{}/NorthstarLauncher.exe", game_install.game_path); + let ns_params: Vec<&str> = game_install.launch_parameters.split_whitespace().collect(); + + let mut args = vec!["/C", "start", "", &ns_exe_path]; + // We cannot add the params directly because of limitations with cmd.exe + // https://stackoverflow.com/questions/9964865/c-system-not-working-when-there-are-spaces-in-two-different-parameters/9965141#9965141 + args.extend(ns_params); let _output = std::process::Command::new("C:\\Windows\\System32\\cmd.exe") - .args(["/C", "start", "", &ns_exe_path]) + .args(args) .spawn() .expect("failed to execute process"); return Ok("Launched game".to_string()); @@ -173,7 +179,7 @@ pub fn launch_northstar_steam( return Err("Couldn't access Titanfall2 directory".to_string()); } - match open::that(format!("steam://run/{}//--northstar/", TITANFALL2_STEAM_ID)) { + match open::that(format!("steam://run/{}//--northstar {}/", TITANFALL2_STEAM_ID, game_install.launch_parameters)) { Ok(()) => Ok("Started game".to_string()), Err(_err) => Err("Failed to launch Titanfall 2 via Steam".to_string()), } diff --git a/src-vue/src/i18n/lang/en.json b/src-vue/src/i18n/lang/en.json index 470e98be..b1c69388 100644 --- a/src-vue/src/i18n/lang/en.json +++ b/src-vue/src/i18n/lang/en.json @@ -92,6 +92,7 @@ "settings": { "manage_install": "Manage installation", + "launch_parameters": "Launch parameters", "choose_folder": "Choose installation folder", "open_game_folder": "Open Folder", "nb_ts_mods_per_page": "Number of Thunderstore mods per page", diff --git a/src-vue/src/plugins/store.ts b/src-vue/src/plugins/store.ts index e7dc0763..57021c97 100644 --- a/src-vue/src/plugins/store.ts +++ b/src-vue/src/plugins/store.ts @@ -26,6 +26,7 @@ const persistentStore = new Store('flight-core-settings.json'); export interface FlightCoreStore { developer_mode: boolean, game_path: string, + launch_parameters: string, install_type: InstallType, flightcore_version: string, @@ -62,6 +63,7 @@ export const store = createStore<FlightCoreStore>({ return { developer_mode: false, game_path: undefined as unknown as string, + launch_parameters: undefined as unknown as string, install_type: undefined as unknown as InstallType, flightcore_version: "", @@ -243,7 +245,8 @@ export const store = createStore<FlightCoreStore>({ async launchGameSteam(state: any, no_checks = false) { let game_install = { game_path: state.game_path, - install_type: state.install_type + install_type: state.install_type, + launch_parameters: state.launch_parameters } as GameInstall; await invoke("launch_northstar_steam", { gameInstall: game_install, bypassChecks: no_checks }) @@ -374,6 +377,11 @@ async function _initializeApp(state: any) { state.enableReleasesSwitch = valueFromStore.value; } + const paramsFromStore: { value: boolean } | null = await persistentStore.get('northstar-launch-parameters'); + if (paramsFromStore) { + state.launch_parameters = paramsFromStore.value; + } + // Grab "Thunderstore mods per page" setting from store if possible const perPageFromStore: { value: number } | null = await persistentStore.get('thunderstore-mods-per-page'); if (perPageFromStore && perPageFromStore.value) { diff --git a/src-vue/src/utils/GameInstall.ts b/src-vue/src/utils/GameInstall.ts index 07358f6c..22081afc 100644 --- a/src-vue/src/utils/GameInstall.ts +++ b/src-vue/src/utils/GameInstall.ts @@ -1,4 +1,5 @@ export interface GameInstall { game_path: string; + launch_parameters: string; install_type: string; } diff --git a/src-vue/src/views/SettingsView.vue b/src-vue/src/views/SettingsView.vue index c4e94c80..5cc87213 100644 --- a/src-vue/src/views/SettingsView.vue +++ b/src-vue/src/views/SettingsView.vue @@ -21,6 +21,15 @@ </el-input> </div> + <!-- Extra Launch parameters when starting Northtsar --> + <div class="fc_parameter__panel"> + <h3>{{ $t('settings.launch_parameters') }}</h3> + <el-input + v-model="launchParameters" + > + </el-input> + </div> + <!-- Thunderstore mods per page configuration --> <div class="fc_parameter__panel"> <h3>{{ $t('settings.nb_ts_mods_per_page') }}</h3> @@ -135,6 +144,16 @@ export default defineComponent({ } } }, + launchParameters: { + get(): string { + return this.$store.state.launch_parameters + }, + async set(value: string) { + this.$store.state.launch_parameters = value; + persistentStore.set('northstar-launch-parameters', { value }); + await persistentStore.save(); // explicit save to disk + } + }, modsPerPage: { get(): number { return this.$store.state.mods_per_page; |