diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 639efdba..b03212bc 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-3.0 -* @XLabsProject/Developers +* @diamante0018 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index bfa69ba1..d26c96e1 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -3,6 +3,6 @@ contact_links: - name: Discord Server url: https://discord.gg/sKeVmR3/ about: Please ask and answer support questions here. - - name: XLabsProject Website - url: https://xlabs.dev/ + - name: AlterWare Website + url: https://alterware.dev/ about: The official website. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/get-help.md b/.github/ISSUE_TEMPLATE/get-help.md index 7426ade0..fae523bd 100644 --- a/.github/ISSUE_TEMPLATE/get-help.md +++ b/.github/ISSUE_TEMPLATE/get-help.md @@ -8,8 +8,8 @@ assignees: '' --- _Do not open an issue here if you need help with modding or have a problem getting the client to run. -It is very likely your problem will be resolved by reading the [FAQ](https://xlabs.dev/iw4x_faq) carefully. -Ask in `iw4x-support` or `iw4x-modding` channels on the [Discord](https://discord.gg/sKeVmR3) server if you still have problems. +It is very likely your problem will be resolved by reading the [FAQ](https://youtu.be/dQw4w9WgXcQ) carefully. +Ask in `iw4x-support` or `iw4x-modding` channels on the [Discord](https://alterware.dev/) server if you still have problems. If this does not apply, please continue by filling in the template below._ **What are you trying to do?** diff --git a/.github/ISSUE_TEMPLATE/request-a-feature.md b/.github/ISSUE_TEMPLATE/request-a-feature.md index 37d72635..f950302a 100644 --- a/.github/ISSUE_TEMPLATE/request-a-feature.md +++ b/.github/ISSUE_TEMPLATE/request-a-feature.md @@ -7,7 +7,7 @@ assignees: '' --- -_Before opening a new feature request, please see [Issues](https://github.com/XLabsProject/iw4x-client/issues) and check that a similar issue does not already exist. +_Before opening a new feature request, please see [Issues](https://github.com/diamante0018/iw4x-client/issues) and check that a similar issue does not already exist. If this a new request, help us help you by filling in the template below._ **What problem will this solve?** diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 82a087e1..a2d02d10 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -14,6 +14,6 @@ Add any other context about your changes here. **Did you check all the boxes?** - [ ] Focus on a single fix or feature; remove any unrelated formatting or code changes -- [ ] Mention any [related issues](https://github.com/XLabsProject/iw4x-client/issues) (put `closes #XXXX` in comment to auto-close issue when PR is merged) -- [ ] Follow our [coding conventions](https://github.com/XLabsProject/iw4x-client/blob/master/CODESTYLE.md) +- [ ] Mention any [related issues](https://github.com/diamante0018/iw4x-client/issues) (put `closes #XXXX` in comment to auto-close issue when PR is merged) +- [ ] Follow our [coding conventions](https://github.com/diamante0018/iw4x-client/blob/master/CODESTYLE.md) - [ ] Minimize the number of commits diff --git a/SECURITY.md b/SECURITY.md index ab88d3a6..b8759f91 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,15 +1,10 @@ ## iw4x-client Security -We take security very seriously at XLabsProject. We welcome any peer review of our 100% free software source code to ensure nobody's IW4x clients or servers are ever compromised or hacked. +We take security very seriously at AlterWare. We welcome any peer review of our 100% free software source code to ensure nobody's IW4x clients or servers are ever compromised or hacked. ### Where should I report security issues? In order to give the community time to respond and upgrade we strongly urge you report all security issues privately. -Please e-mail MauriceHeumann@gmail.com directly to provide details and repro steps. - -### Other key people - -In the exceptional case that you do not receive a response within a reasonable time frame from our lead developer, please contact any of the following people: -- Future/diamante0018: iw4x-sp@proton.me +Please e-mail iw4x-sp@proton.me directly to provide details and repro steps. We will try respond as soon as possible, but please note: diff --git a/src/Components/Modules/FileSystem.cpp b/src/Components/Modules/FileSystem.cpp index a29d0fbb..40a33d9f 100644 --- a/src/Components/Modules/FileSystem.cpp +++ b/src/Components/Modules/FileSystem.cpp @@ -153,7 +153,7 @@ namespace Components CoTaskMemFree(path); }); - return std::filesystem::path(path) / "xlabs"; + return std::filesystem::path(path); } std::vector FileSystem::GetFileList(const std::string& path, const std::string& extension) @@ -376,7 +376,7 @@ namespace Components // Handle IWD freeing Utils::Hook(0x642F60, IwdFreeStub, HOOK_CALL).install()->quick(); - // Set the working dir based on info from the Xlabs launcher + // Set the working dir based on info from the AlterWare launcher Utils::Hook(0x4326E0, Sys_DefaultInstallPath_Hk, HOOK_JUMP).install()->quick(); } diff --git a/src/Components/Modules/Maps.cpp b/src/Components/Modules/Maps.cpp index faa66156..d1fc3b2c 100644 --- a/src/Components/Modules/Maps.cpp +++ b/src/Components/Modules/Maps.cpp @@ -767,16 +767,7 @@ namespace Components UIScript::Add("downloadDLC", []([[maybe_unused]] const UIScript::Token& token, [[maybe_unused]] const Game::uiInfo_s* info) { - int dlc = token.get(); - - for (const auto& pack : Maps::DlcPacks) - { - if (pack.index == dlc) - { - ShellExecuteW(0, 0, L"https://xlabs.dev/support_iw4x_client.html", 0, 0, SW_SHOW); - return; - } - } + const auto dlc = token.get(); Game::ShowMessageBox(Utils::String::VA("DLC %d does not exist!", dlc), "ERROR"); }); diff --git a/src/Components/Modules/QuickPatch.cpp b/src/Components/Modules/QuickPatch.cpp index 8ea1cafb..fb3a1561 100644 --- a/src/Components/Modules/QuickPatch.cpp +++ b/src/Components/Modules/QuickPatch.cpp @@ -245,10 +245,10 @@ namespace Components } auto workingDir = std::filesystem::current_path().string(); - auto binary = FileSystem::GetAppdataPath() / "data" / "iw4x" / *Game::sys_exitCmdLine; + const std::string binary = *Game::sys_exitCmdLine; - SetEnvironmentVariableA("XLABS_MW2_INSTALL", workingDir.data()); - Utils::Library::LaunchProcess(binary.string(), "-singleplayer", workingDir); + SetEnvironmentVariableA("MW2_INSTALL", workingDir.data()); + Utils::Library::LaunchProcess(binary, "-singleplayer", workingDir); } __declspec(naked) void QuickPatch::SND_GetAliasOffset_Stub() @@ -320,7 +320,7 @@ namespace Components Utils::Hook::Set(0x51FCDD, QuickPatch::R_AddImageToList_Hk); - Utils::Hook::Set(0x41DB8C, "iw4x-sp.exe"); + Utils::Hook::Set(0x41DB8C, "iw4-sp.exe"); Utils::Hook(0x4D6989, QuickPatch::Sys_SpawnQuitProcess_Hk, HOOK_CALL).install()->quick(); // Fix crash as nullptr goes unchecked diff --git a/src/DllMain.cpp b/src/DllMain.cpp index 3f92b015..1bb781b0 100644 --- a/src/DllMain.cpp +++ b/src/DllMain.cpp @@ -61,7 +61,7 @@ BOOL APIENTRY DllMain(HINSTANCE /*hinstDLL*/, DWORD fdwReason, LPVOID /*lpvReser MessageBoxA(nullptr, "Failed to load game binary.\n" "You did not install the iw4x-rawfiles!\n" - "Please use the XLabs launcher to run the game. For support, please visit https://xlabs.dev/support_iw4x_client", + "Please use the AlterWare launcher to run the game. For support, please visit https://alterware.dev/", "ERROR", MB_ICONERROR ); diff --git a/src/Resource.rc b/src/Resource.rc index 8cbfe655..9cd3ff35 100644 --- a/src/Resource.rc +++ b/src/Resource.rc @@ -63,7 +63,7 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "CompanyName", "XLabsProject" + VALUE "CompanyName", "AlterWare" #ifdef _DEBUG VALUE "FileDescription", "IW4 client modification (DEBUG)" #else @@ -71,7 +71,7 @@ BEGIN #endif VALUE "FileVersion", REVISION_STR VALUE "InternalName", "iw4x" - VALUE "LegalCopyright", "Copyright 2023 The XLabsProject Team. All rights reserved." + VALUE "LegalCopyright", "Copyright 2023 The AlterWare Team. All rights reserved." VALUE "OriginalFilename", "iw4x.dll" VALUE "ProductName", "IW4x" VALUE "ProductVersion", REVISION_STR diff --git a/src/Utils/Cache.cpp b/src/Utils/Cache.cpp index b3240757..d7e6d7dc 100644 --- a/src/Utils/Cache.cpp +++ b/src/Utils/Cache.cpp @@ -5,8 +5,8 @@ namespace Utils { const char* Cache::Urls[] = { - "https://raw.githubusercontent.com/XLabsProject/iw4x-client", - "https://xlabs.dev", + "https://raw.githubusercontent.com/diamante0018/iw4x-client", + "https://alterware.dev", }; std::string Cache::ValidUrl; diff --git a/src/Utils/Utils.cpp b/src/Utils/Utils.cpp index 6b789189..a1066804 100644 --- a/src/Utils/Utils.cpp +++ b/src/Utils/Utils.cpp @@ -112,15 +112,15 @@ namespace Utils auto* exeBaseName = std::wcsrchr(binaryPath, L'\\'); exeBaseName[0] = L'\0'; - // Make the game work without the xlabs launcher + // Make the game work without the AlterWare launcher SetCurrentDirectoryW(binaryPath); } void SetEnvironment() { - wchar_t* buffer{}; + char* buffer{}; std::size_t size{}; - if (_wdupenv_s(&buffer, &size, L"XLABS_MW2_INSTALL") != 0 || buffer == nullptr) + if (_dupenv_s(&buffer, &size, "MW2_INSTALL") != 0 || buffer == nullptr) { SetLegacyEnvironment(); return; @@ -128,8 +128,8 @@ namespace Utils const auto _0 = gsl::finally([&] { std::free(buffer); }); - SetCurrentDirectoryW(buffer); - SetDllDirectoryW(buffer); + SetCurrentDirectoryA(buffer); + SetDllDirectoryA(buffer); } HMODULE GetNTDLL()