redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-04-21 04:07:46 +00:00
Code Activity

Fix logging in now that 32-bit support disappeared

Browse source 
In the March 2024 the 32-bit client was removed, so we need to modify
some of the boot targets that no longer exist. The DirectX 9 client is
gone too, but that will be dealt with in a later commit.

(cherry picked from commit 516c0926a6)
This commit is contained in:
Joshua Goins 2024-03-19 18:27:03 -04:00
parent dde9aeda55
commit e8444a2fb8
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
launcher/src/squareenixlogin.cpp
View file

@ -18,6 +18,10 @@
#include "launchercore.h" #include "launchercore.h"
#include "utility.h" #include "utility.h"
// Support for the 32-bit DX9 client was removed in March 2024
// TODO: we should probably detect this automatically
#define SUPPORT_32BIT 0
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;
SquareEnixLogin::SquareEnixLogin(LauncherCore &window, QObject *parent) SquareEnixLogin::SquareEnixLogin(LauncherCore &window, QObject *parent)
@ -374,12 +378,19 @@ QCoro::Task<bool> SquareEnixLogin::registerSession()
QCoro::Task<QString> SquareEnixLogin::getBootHash() QCoro::Task<QString> SquareEnixLogin::getBootHash()
{ {
#if SUPPORT_32BIT
const QList<QString> fileList = {QStringLiteral("ffxivboot.exe"), const QList<QString> fileList = {QStringLiteral("ffxivboot.exe"),
QStringLiteral("ffxivboot64.exe"), QStringLiteral("ffxivboot64.exe"),
QStringLiteral("ffxivlauncher.exe"), QStringLiteral("ffxivlauncher.exe"),
QStringLiteral("ffxivlauncher64.exe"), QStringLiteral("ffxivlauncher64.exe"),
QStringLiteral("ffxivupdater.exe"), QStringLiteral("ffxivupdater.exe"),
QStringLiteral("ffxivupdater64.exe")}; QStringLiteral("ffxivupdater64.exe")};
#else
const QList<QString> fileList = {QStringLiteral("ffxivboot.exe"),
QStringLiteral("ffxivboot64.exe"),
QStringLiteral("ffxivlauncher64.exe"),
QStringLiteral("ffxivupdater64.exe")};
#endif
const auto hashFuture = QtConcurrent::mapped(fileList, [this](const auto &filename) -> QString { const auto hashFuture = QtConcurrent::mapped(fileList, [this](const auto &filename) -> QString {
return getFileHash(m_info->profile->gamePath() + QStringLiteral("/boot/") + filename); return getFileHash(m_info->profile->gamePath() + QStringLiteral("/boot/") + filename);