From b4b3ca24a1672f8e84b79618cd8335fad824a504 Mon Sep 17 00:00:00 2001 From: Rim Date: Wed, 15 May 2024 01:44:47 -0400 Subject: [PATCH] maint: rebrand --- .github/workflows/build.yml | 6 +++--- README.md | 10 +--------- build.bat | 2 +- premake5.lua | 6 +++--- src/game/demonware/services/bdDediAuth.cpp | 2 +- src/game/demonware/services/bdDediRSAAuth.cpp | 2 +- src/game/demonware/services/bdSteamAuth.cpp | 4 ++-- src/game/game.hpp | 2 +- src/launcher/launcher.cpp | 2 +- src/module/file_system.cpp | 2 +- src/module/steam_proxy.cpp | 4 ++-- src/resource.rc | 8 ++++---- src/resources/dw/motd-english.txt | 2 +- src/resources/main.html | 4 ++-- src/steam/interfaces/user.cpp | 2 +- 15 files changed, 25 insertions(+), 33 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b0491a..29b2ee8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,12 +41,12 @@ jobs: uses: ammaraskar/msvc-problem-matcher@master - name: Build ${{matrix.configuration}} binaries - run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=Win32 build/open-iw5.sln + run: msbuild /m /v:minimal /p:Configuration=${{matrix.configuration}} /p:Platform=Win32 build/iw5-mod.sln - name: Upload ${{matrix.configuration}} binaries uses: actions/upload-artifact@v3.1.2 with: name: ${{matrix.configuration}} binaries path: | - build/bin/Win32/${{matrix.configuration}}/open-iw5.exe - build/bin/Win32/${{matrix.configuration}}/open-iw5.pdb + build/bin/Win32/${{matrix.configuration}}/iw5-mod.exe + build/bin/Win32/${{matrix.configuration}}/iw5-mod.pdb diff --git a/README.md b/README.md index f92fafc..3fe9239 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,4 @@ -[![Build](https://github.com/momo5502/open-iw5/workflows/Build/badge.svg)](https://github.com/momo5502/open-iw5/actions) -![issues](https://img.shields.io/github/issues/momo5502/open-iw5.svg) -![license](https://img.shields.io/github/license/momo5502/open-iw5.svg) -![forks](https://img.shields.io/github/forks/momo5502/open-iw5.svg) -![stars](https://img.shields.io/github/stars/momo5502/open-iw5.svg) -![watchers](https://img.shields.io/github/watchers/momo5502/open-iw5.svg) - - -# Open-IW5 +# IW5-Mod Open source MW3 singleplayer and multiplayer client. Requires the MW3 dedicated server files. diff --git a/build.bat b/build.bat index 8a580f1..f9f84e6 100644 --- a/build.bat +++ b/build.bat @@ -1,5 +1,5 @@ @echo off -"C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\msbuild.exe" build\open-iw5.sln /p:Configuration=Release /p:Platform=Win32 +"C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\msbuild.exe" build\iw5-mod.sln /p:Configuration=Release /p:Platform=Win32 pause \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index 725cc3e..c4ec071 100644 --- a/premake5.lua +++ b/premake5.lua @@ -36,8 +36,8 @@ newoption { dependencies.load() -workspace "open-iw5" - startproject "open-iw5" +workspace "iw5-mod" + startproject "iw5-mod" location "./build" objdir "%{wks.location}/obj" targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}" @@ -80,7 +80,7 @@ workspace "open-iw5" defines {"DEBUG", "_DEBUG"} filter {} - project "open-iw5" + project "iw5-mod" kind "ConsoleApp" language "C++" diff --git a/src/game/demonware/services/bdDediAuth.cpp b/src/game/demonware/services/bdDediAuth.cpp index 79e42f8..d1459db 100644 --- a/src/game/demonware/services/bdDediAuth.cpp +++ b/src/game/demonware/services/bdDediAuth.cpp @@ -33,7 +33,7 @@ namespace demonware auto key = utils::cryptography::tiger::compute(SERVER_CD_KEY); - strcpy_s(auth_ticket.m_username, "Open-IW5 Server"); + strcpy_s(auth_ticket.m_username, "iw5-mod Server"); std::memcpy(auth_ticket.m_sessionKey, key.data(), 24); auth_ticket.m_timeIssued = static_cast(time(nullptr)); diff --git a/src/game/demonware/services/bdDediRSAAuth.cpp b/src/game/demonware/services/bdDediRSAAuth.cpp index df05bf1..a38fd5e 100644 --- a/src/game/demonware/services/bdDediRSAAuth.cpp +++ b/src/game/demonware/services/bdDediRSAAuth.cpp @@ -35,7 +35,7 @@ namespace demonware auto key = utils::cryptography::tiger::compute(SERVER_CD_KEY); - strcpy_s(auth_ticket.m_username, "Open-IW5 Server"); + strcpy_s(auth_ticket.m_username, "iw5-mod Server"); std::memcpy(auth_ticket.m_sessionKey, key.data(), 24); auth_ticket.m_timeIssued = static_cast(time(nullptr)); diff --git a/src/game/demonware/services/bdSteamAuth.cpp b/src/game/demonware/services/bdSteamAuth.cpp index d7c4b65..25246ea 100644 --- a/src/game/demonware/services/bdSteamAuth.cpp +++ b/src/game/demonware/services/bdSteamAuth.cpp @@ -31,9 +31,9 @@ namespace demonware auth_ticket.m_titleID = title_id; auth_ticket.m_userID = steam::SteamUser()->GetSteamID().bits; - auto key = utils::cryptography::tiger::compute("Open-IW5"); + auto key = utils::cryptography::tiger::compute("iw5-mod"); - strcpy_s(auth_ticket.m_username, "Open-IW5 User"); + strcpy_s(auth_ticket.m_username, "iw5-mod User"); std::memcpy(auth_ticket.m_sessionKey, key.data(), 24); auth_ticket.m_timeIssued = static_cast(time(nullptr)); diff --git a/src/game/game.hpp b/src/game/game.hpp index beaca2d..46809a2 100644 --- a/src/game/game.hpp +++ b/src/game/game.hpp @@ -5,7 +5,7 @@ #define SELECT_VALUE(sp, mp) (game::is_sp() ? (sp) : (mp)) -#define SERVER_CD_KEY "Open-IW5-CD-Key" +#define SERVER_CD_KEY "iw5-mod-CD-Key" namespace game { diff --git a/src/launcher/launcher.cpp b/src/launcher/launcher.cpp index fc0c5b2..39acd28 100644 --- a/src/launcher/launcher.cpp +++ b/src/launcher/launcher.cpp @@ -46,7 +46,7 @@ void launcher::create_main_menu() return DefWindowProcA(*window, message, w_param, l_param); }); - this->main_window_.create("Open-IW5", 750, 430); + this->main_window_.create("iw5-mod", 750, 430); this->main_window_.load_html(load_content(MENU_MAIN)); this->main_window_.show(); } diff --git a/src/module/file_system.cpp b/src/module/file_system.cpp index c5d7763..cfcdbe6 100644 --- a/src/module/file_system.cpp +++ b/src/module/file_system.cpp @@ -657,7 +657,7 @@ void file_system::post_load() utils::hook(0x5B2115, fs_shutdown_stub, HOOK_CALL).install()->quick(); // FS_Restart } - // Make open-iw5 work outside of the game directory + // Make iw5-mod work outside of the game directory sys_default_install_path_hook.create(SELECT_VALUE(0x487E50, 0x5C4A80), &sys_default_install_path_stub); // fs_basegame diff --git a/src/module/steam_proxy.cpp b/src/module/steam_proxy.cpp index fa7ab1c..899d54b 100644 --- a/src/module/steam_proxy.cpp +++ b/src/module/steam_proxy.cpp @@ -27,11 +27,11 @@ public: { if (game::is_sp()) { - this->start_mod("\xF0\x9F\x90\x8D Open-IW5 Singleplayer", 42680); + this->start_mod("\xF0\x9F\x90\x8D iw5-mod Singleplayer", 42680); } else if (game::is_mp()) { - this->start_mod("\xF0\x9F\x90\x8D Open-IW5 Multiplayer", 42690); + this->start_mod("\xF0\x9F\x90\x8D iw5-mod Multiplayer", 42690); } } catch (const std::exception& e) diff --git a/src/resource.rc b/src/resource.rc index d7b3484..670246f 100644 --- a/src/resource.rc +++ b/src/resource.rc @@ -62,12 +62,12 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "momo5502" - VALUE "FileDescription", "Open-IW5" + VALUE "FileDescription", "iw5-mod" VALUE "FileVersion", "1.0.0.0" - VALUE "InternalName", "Open-IW5" + VALUE "InternalName", "iw5-mod" VALUE "LegalCopyright", "All rights reserved." - VALUE "OriginalFilename", "open-iw5.exe" - VALUE "ProductName", "open-iw5" + VALUE "OriginalFilename", "iw5-mod.exe" + VALUE "ProductName", "iw5-mod" VALUE "ProductVersion", "1.0.0.0" END END diff --git a/src/resources/dw/motd-english.txt b/src/resources/dw/motd-english.txt index 103fd1a..6ca18d5 100644 --- a/src/resources/dw/motd-english.txt +++ b/src/resources/dw/motd-english.txt @@ -1 +1 @@ -Welcome to Open-IW5 \ No newline at end of file +Welcome to iw5-mod \ No newline at end of file diff --git a/src/resources/main.html b/src/resources/main.html index 5625c0d..dbd8b55 100644 --- a/src/resources/main.html +++ b/src/resources/main.html @@ -4,7 +4,7 @@ - Open-IW5 + iw5-mod