forked from unab0mb/7h
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
SeventhHeavenUI: Enable native Steam edition support
Launching the Steam edition of the game will no more require a conversion. Additionally, launching 1998 edition will now require the official disk. Every other way is not officially supported starting now.
- Loading branch information
1 parent
2a4b93e
commit 101a0f8
Showing
37 changed files
with
548 additions
and
1,032 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| name: 7th-Heaven | ||
|
|
||
| run-name: 3.5.1.${{ github.run_number }} | ||
| run-name: 3.9.9.${{ github.run_number }} | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
@@ -20,7 +20,7 @@ env: | |
| _RELEASE_VERSION: v0 | ||
| _RELEASE_CONFIGURATION: Release | ||
| _BUILD_BRANCH: "${{ github.ref }}" | ||
| _BUILD_VERSION: "3.5.1.${{ github.run_number }}" | ||
| _BUILD_VERSION: "3.9.9.${{ github.run_number }}" | ||
| _CHANGELOG_VERSION: "0" | ||
| # VCPKG: Enable Binary Caching | ||
| VCPKG_BINARY_SOURCES: clear;nuget,github,readwrite | ||
|
|
@@ -40,7 +40,9 @@ jobs: | |
| git config --global core.filemode false | ||
| git config --global core.longpaths true | ||
| - name: Checkout | ||
| uses: actions/[email protected] | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| fetch-depth: 0 | ||
| - name: Prepare Environment | ||
| run: ".github/workflows/prepare.ps1" | ||
| shell: pwsh | ||
|
|
@@ -55,7 +57,7 @@ jobs: | |
| - name: Restore NuGet Packages | ||
| run: nuget restore ${{ github.workspace }}\${{ env._RELEASE_NAME }}.sln | ||
| - name: Add MSBuild to PATH | ||
| uses: microsoft/setup-msbuild@v1.3.2 | ||
| uses: microsoft/setup-msbuild@v1 | ||
| - name: Run MSBuild | ||
| run: msbuild ${{ github.workspace }}\${{ env._RELEASE_NAME }}.sln /p:WindowsTargetPlatformVersion=10.0.19041.0 /m -p:Configuration=${{ env._RELEASE_CONFIGURATION }} -p:Platform="Any CPU" | ||
| - name: Prepare Installer | ||
|
|
@@ -90,7 +92,7 @@ jobs: | |
| return ret; | ||
| - name: Publish PR artifacts | ||
| if: env._IS_GITHUB_RELEASE == 'false' && success() | ||
| uses: actions/upload-artifact@v4.0.0 | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: "${{ env._RELEASE_NAME }}-${{ env._RELEASE_VERSION }}" | ||
| path: ".dist/*" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,13 @@ The original developer is Iros <[email protected]> | |
|
|
||
| namespace Iros._7th.Workshop { | ||
|
|
||
| public enum FF7Version | ||
| { | ||
| Unknown = -1, | ||
| Steam, | ||
| ReRelease, | ||
| Original98 | ||
| } | ||
|
|
||
| public enum GeneralOptions { | ||
| None = 0, | ||
|
|
@@ -105,6 +112,7 @@ public List<string> SubscribedUrls | |
| public string FF7Exe { get; set; } | ||
| [System.Xml.Serialization.XmlElement("AlsoLaunch")] | ||
| public List<ProgramLaunchInfo> ProgramsToLaunchPrior { get; set; } | ||
| public FF7Version FF7InstalledVersion { get; set; } | ||
| public FFNxUpdateChannelOptions FFNxUpdateChannel { get; set; } | ||
| public AppUpdateChannelOptions AppUpdateChannel { get; set; } | ||
| public DateTime LastUpdateCheck { get; set; } | ||
|
|
@@ -202,7 +210,7 @@ public static Settings UseDefaultSettings() | |
| /// <param name="pathToFf7Install"></param> | ||
| public void SetPathsFromInstallationPath(string pathToFf7Install) | ||
| { | ||
| FF7Exe = Path.Combine(pathToFf7Install, "FF7.exe"); | ||
| FF7Exe = Sys.Settings.FF7InstalledVersion == FF7Version.Original98 ? Path.Combine(pathToFf7Install, "FF7.exe") : Path.Combine(pathToFf7Install, "ff7_en.exe"); | ||
| LibraryLocation = Path.Combine(pathToFf7Install, "mods", @"7th Heaven"); | ||
|
|
||
| LogAndCreateFolderIfNotExists(LibraryLocation); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,6 @@ The original developer is Iros <[email protected]> | |
|
|
||
| namespace Iros._7th.Workshop | ||
| { | ||
|
|
||
| public class ModStatusEventArgs : EventArgs | ||
| { | ||
| public ModStatus OldStatus { get; set; } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // FF7_Launcher.cpp : Defines the entry point for the application. | ||
| // | ||
|
|
||
| #include <windows.h> | ||
| #include "Resource.h" | ||
|
|
||
| int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) | ||
| { | ||
| // Initialize the process start information | ||
| STARTUPINFO si; | ||
| PROCESS_INFORMATION pi; | ||
| ZeroMemory(&si, sizeof(si)); | ||
| si.cb = sizeof(si); | ||
| ZeroMemory(&pi, sizeof(pi)); | ||
|
|
||
| // Start the process | ||
| if (!CreateProcess(L"ff7_en.exe", NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return 1; | ||
|
|
||
| // Wait for the process to finish | ||
| WaitForSingleObject(pi.hProcess, INFINITE); | ||
|
|
||
| // Close process and thread handles | ||
| CloseHandle(pi.hProcess); | ||
| CloseHandle(pi.hThread); | ||
|
|
||
| return 0; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| #pragma once | ||
|
|
||
| #include "resource.h" |
Binary file not shown.
Binary file not shown.
Oops, something went wrong.