diff --git a/cmake/mbedtls.cmake b/cmake/mbedtls.cmake index a2df70d..edfc50b 100644 --- a/cmake/mbedtls.cmake +++ b/cmake/mbedtls.cmake @@ -1,7 +1,7 @@ CPMAddPackage( NAME mbedtls GITHUB_REPOSITORY Mbed-TLS/mbedtls - GIT_TAG mbedtls-3.6.5 + GIT_TAG mbedtls-3.6.6 OPTIONS "ENABLE_PROGRAMS OFF" "ENABLE_TESTING OFF" diff --git a/src/main.cpp b/src/main.cpp index 9e75c86..22f38de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,7 +56,7 @@ namespace globals std::string g_OtpCode = ""; // The OTP code the user input char g_SessionHash[16] = {}; // Session hash sent from auth std::string g_Email = ""; // Email, currently unused - std::array g_VersionNumber = { 2, 1, 1 }; // xiloader version number sent to auth server. Must be x.x.x with single characters for 'x'. Remember to also change in xiloader.rc.in + std::array g_VersionNumber = { 2, 1, 2 }; // xiloader version number sent to auth server. Must be x.x.x with single characters for 'x'. Remember to also change in xiloader.rc.in bool g_FirstLogin = false; // set to true when --user --pass are both set to allow for autologin std::string g_TrustToken = ""; // trust token loaded from disk or received from server bool g_TrustThisComputer = false; // user checkbox / CLI flag for "trust this computer" @@ -792,6 +792,14 @@ int __cdecl main(int argc, char* argv[]) lpCommandTable[POLFUNC_FFXI_LANG](xiloader::functions::GetRegistryPlayOnlineLanguage(globals::g_Language)); lpCommandTable[POLFUNC_REGISTRY_KEY](xiloader::functions::GetRegistryPlayOnlineKey(globals::g_Language)); lpCommandTable[POLFUNC_INSTALL_FOLDER](xiloader::functions::GetRegistryPlayOnlineInstallFolder(globals::g_Language)); + + // If we are set to non-japanese locale for POL, copy in the english text for invalid name on character creation + // We are not properly loading in sqpolcts.bin which would normally have this (decrypted) + if (globals::g_Language != xiloader::Language::Japanese) + { + lpCommandTable[1302](0x04, "The name you entered is unavailable.\nPlease choose another name."); + } + lpCommandTable[POLFUNC_INET_MUTEX](); if (!SetProfileServerPort(profileServerPort)) diff --git a/src/xiloader.rc.in b/src/xiloader.rc.in index 90fa0e8..8288e61 100644 --- a/src/xiloader.rc.in +++ b/src/xiloader.rc.in @@ -3,13 +3,13 @@ // VALUE "FileVersion", ... 1 VERSIONINFO -FILEVERSION 2,1,1 +FILEVERSION 2,1,2 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "081604b0" BEGIN - VALUE "FileVersion", "2.1.1" + VALUE "FileVersion", "2.1.2" END END END