Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: Pass launch options via object #760

Merged
merged 8 commits into from
Feb 21, 2024
Merged

refactor: Pass launch options via object #760

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b00fbee
refactor: Pass launch options via object
GeckoEidechse Jan 19, 2024
bcb77c2
Merge branch 'main' into refactor/pass-launch-options-object
GeckoEidechse Jan 20, 2024
5284445
Merge branch 'main' into refactor/pass-launch-options-object
GeckoEidechse Jan 27, 2024
0f89bf6
Merge branch 'main' into refactor/pass-launch-options-object
GeckoEidechse Feb 11, 2024
1005c65
Merge branch 'main' into refactor/pass-launch-options-object
GeckoEidechse Feb 12, 2024
c5336ec
refactor: Re-use binding created from Rust code
GeckoEidechse Feb 12, 2024
2f2d7f9
fix: Remove unused interface
GeckoEidechse Feb 12, 2024
24f95d3
Merge branch 'main' into refactor/pass-launch-options-object
GeckoEidechse Feb 12, 2024
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
12 changes: 2 additions & 10 deletions src-vue/src/plugins/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,11 +173,7 @@ export const store = createStore<FlightCoreStore>({
}
}
},
async launchGame(state: any, no_checks = false) {
const launch_options: NorthstarLaunchOptions = {
launch_via_steam: false,
bypass_checks: no_checks,
};
async launchGame(state: any, launch_options: NorthstarLaunchOptions = { launch_via_steam: false, bypass_checks: false}) {

if (launch_options.bypass_checks) {
await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
Expand Down Expand Up @@ -246,11 +242,7 @@ export const store = createStore<FlightCoreStore>({
break;
}
},
async launchGameSteam(state: any, no_checks = false) {
const launch_options: NorthstarLaunchOptions = {
launch_via_steam: true,
bypass_checks: false,
};
async launchGameSteam(state: any, launch_options: NorthstarLaunchOptions = { launch_via_steam: true, bypass_checks: false}) {
await invoke("launch_northstar", { gameInstall: state.game_install, launchOptions: launch_options })
.then((message) => {
showNotification('Success');
Expand Down
7 changes: 5 additions & 2 deletions src-vue/src/views/DeveloperView.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
<script lang="ts">
import { defineComponent } from "vue";
import { invoke } from "@tauri-apps/api";
import { NorthstarLaunchOptions } from "../../../src-tauri/bindings/NorthstarLaunchOptions";
import { TagWrapper } from "../../../src-tauri/bindings/TagWrapper";
import { NorthstarThunderstoreReleaseWrapper } from "../../../src-tauri/bindings/NorthstarThunderstoreReleaseWrapper";
import PullRequestsSelector from "../components/PullRequestsSelector.vue";
Expand Down Expand Up @@ -220,10 +221,12 @@ export default defineComponent({
});
},
async launchGameWithoutChecks() {
this.$store.commit('launchGame', true);
let launch_options: NorthstarLaunchOptions = { bypass_checks: true, launch_via_steam: false };
this.$store.commit('launchGame', launch_options);
},
async launchGameViaSteam() {
this.$store.commit('launchGameSteam', true);
let launch_options: NorthstarLaunchOptions = { bypass_checks: false, launch_via_steam: true };
this.$store.commit('launchGameSteam', launch_options);
},
async getInstalledMods() {
await invoke("get_installed_mods_and_properties", { gameInstall: this.$store.state.game_install }).then((message) => {
Expand Down
Loading