mirror of
https://github.com/hedge-dev/UnleashedRecomp.git
synced 2025-04-28 21:37:58 +03:00
Merge a47d699295
into e4c43ae3b1
This commit is contained in:
commit
f5195e5e49
3 changed files with 11 additions and 2 deletions
|
@ -333,7 +333,14 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
if (!InstallerWizard::Run(GAME_INSTALL_DIRECTORY, isGameInstalled && forceDLCInstaller))
|
if (!InstallerWizard::Run(GAME_INSTALL_DIRECTORY, isGameInstalled && forceDLCInstaller))
|
||||||
{
|
{
|
||||||
std::_Exit(0);
|
if (!forceDLCInstaller)
|
||||||
|
{
|
||||||
|
std::_Exit(0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
InstallerWizard::s_returnToTitle = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#include <api/SWA.h>
|
#include <api/SWA.h>
|
||||||
#include <ui/game_window.h>
|
#include <ui/game_window.h>
|
||||||
|
#include <ui/installer_wizard.h>
|
||||||
#include <user/achievement_manager.h>
|
#include <user/achievement_manager.h>
|
||||||
#include <user/persistent_storage_manager.h>
|
#include <user/persistent_storage_manager.h>
|
||||||
#include <user/config.h>
|
#include <user/config.h>
|
||||||
|
@ -83,7 +84,7 @@ PPC_FUNC(sub_825197C0)
|
||||||
PPC_FUNC_IMPL(__imp__sub_82547DF0);
|
PPC_FUNC_IMPL(__imp__sub_82547DF0);
|
||||||
PPC_FUNC(sub_82547DF0)
|
PPC_FUNC(sub_82547DF0)
|
||||||
{
|
{
|
||||||
if (Config::SkipIntroLogos)
|
if (Config::SkipIntroLogos || InstallerWizard::s_returnToTitle)
|
||||||
{
|
{
|
||||||
ctx.r4.u64 = 0;
|
ctx.r4.u64 = 0;
|
||||||
ctx.r5.u64 = 0;
|
ctx.r5.u64 = 0;
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
struct InstallerWizard
|
struct InstallerWizard
|
||||||
{
|
{
|
||||||
static inline bool s_isVisible = false;
|
static inline bool s_isVisible = false;
|
||||||
|
static inline bool s_returnToTitle = false;
|
||||||
|
|
||||||
static void Init();
|
static void Init();
|
||||||
static void Draw();
|
static void Draw();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue