maint: rebrand

This commit is contained in:
Rim 2024-05-15 01:44:47 -04:00
parent db0ffd2d4c
commit b4b3ca24a1
15 changed files with 25 additions and 33 deletions

View File

@ -41,12 +41,12 @@ jobs:
uses: ammaraskar/msvc-problem-matcher@master uses: ammaraskar/msvc-problem-matcher@master
- name: Build ${{matrix.configuration}} binaries - 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 - name: Upload ${{matrix.configuration}} binaries
uses: actions/upload-artifact@v3.1.2 uses: actions/upload-artifact@v3.1.2
with: with:
name: ${{matrix.configuration}} binaries name: ${{matrix.configuration}} binaries
path: | path: |
build/bin/Win32/${{matrix.configuration}}/open-iw5.exe build/bin/Win32/${{matrix.configuration}}/iw5-mod.exe
build/bin/Win32/${{matrix.configuration}}/open-iw5.pdb build/bin/Win32/${{matrix.configuration}}/iw5-mod.pdb

View File

@ -1,12 +1,4 @@
[![Build](https://github.com/momo5502/open-iw5/workflows/Build/badge.svg)](https://github.com/momo5502/open-iw5/actions) # IW5-Mod
![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
Open source MW3 singleplayer and multiplayer client. Open source MW3 singleplayer and multiplayer client.
Requires the MW3 dedicated server files. Requires the MW3 dedicated server files.

View File

@ -1,5 +1,5 @@
@echo off @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 pause

View File

@ -36,8 +36,8 @@ newoption {
dependencies.load() dependencies.load()
workspace "open-iw5" workspace "iw5-mod"
startproject "open-iw5" startproject "iw5-mod"
location "./build" location "./build"
objdir "%{wks.location}/obj" objdir "%{wks.location}/obj"
targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}" targetdir "%{wks.location}/bin/%{cfg.platform}/%{cfg.buildcfg}"
@ -80,7 +80,7 @@ workspace "open-iw5"
defines {"DEBUG", "_DEBUG"} defines {"DEBUG", "_DEBUG"}
filter {} filter {}
project "open-iw5" project "iw5-mod"
kind "ConsoleApp" kind "ConsoleApp"
language "C++" language "C++"

View File

@ -33,7 +33,7 @@ namespace demonware
auto key = utils::cryptography::tiger::compute(SERVER_CD_KEY); 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); std::memcpy(auth_ticket.m_sessionKey, key.data(), 24);
auth_ticket.m_timeIssued = static_cast<uint32_t>(time(nullptr)); auth_ticket.m_timeIssued = static_cast<uint32_t>(time(nullptr));

View File

@ -35,7 +35,7 @@ namespace demonware
auto key = utils::cryptography::tiger::compute(SERVER_CD_KEY); 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); std::memcpy(auth_ticket.m_sessionKey, key.data(), 24);
auth_ticket.m_timeIssued = static_cast<uint32_t>(time(nullptr)); auth_ticket.m_timeIssued = static_cast<uint32_t>(time(nullptr));

View File

@ -31,9 +31,9 @@ namespace demonware
auth_ticket.m_titleID = title_id; auth_ticket.m_titleID = title_id;
auth_ticket.m_userID = steam::SteamUser()->GetSteamID().bits; 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); std::memcpy(auth_ticket.m_sessionKey, key.data(), 24);
auth_ticket.m_timeIssued = static_cast<uint32_t>(time(nullptr)); auth_ticket.m_timeIssued = static_cast<uint32_t>(time(nullptr));

View File

@ -5,7 +5,7 @@
#define SELECT_VALUE(sp, mp) (game::is_sp() ? (sp) : (mp)) #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 namespace game
{ {

View File

@ -46,7 +46,7 @@ void launcher::create_main_menu()
return DefWindowProcA(*window, message, w_param, l_param); 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_.load_html(load_content(MENU_MAIN));
this->main_window_.show(); this->main_window_.show();
} }

View File

@ -657,7 +657,7 @@ void file_system::post_load()
utils::hook(0x5B2115, fs_shutdown_stub, HOOK_CALL).install()->quick(); // FS_Restart 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); sys_default_install_path_hook.create(SELECT_VALUE(0x487E50, 0x5C4A80), &sys_default_install_path_stub);
// fs_basegame // fs_basegame

View File

@ -27,11 +27,11 @@ public:
{ {
if (game::is_sp()) 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()) 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) catch (const std::exception& e)

View File

@ -62,12 +62,12 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "momo5502" VALUE "CompanyName", "momo5502"
VALUE "FileDescription", "Open-IW5" VALUE "FileDescription", "iw5-mod"
VALUE "FileVersion", "1.0.0.0" VALUE "FileVersion", "1.0.0.0"
VALUE "InternalName", "Open-IW5" VALUE "InternalName", "iw5-mod"
VALUE "LegalCopyright", "All rights reserved." VALUE "LegalCopyright", "All rights reserved."
VALUE "OriginalFilename", "open-iw5.exe" VALUE "OriginalFilename", "iw5-mod.exe"
VALUE "ProductName", "open-iw5" VALUE "ProductName", "iw5-mod"
VALUE "ProductVersion", "1.0.0.0" VALUE "ProductVersion", "1.0.0.0"
END END
END END

View File

@ -1 +1 @@
Welcome to Open-IW5 Welcome to iw5-mod

View File

@ -4,7 +4,7 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<title>Open-IW5</title> <title>iw5-mod</title>
<style> <style>
* { * {
@ -380,7 +380,7 @@
</a> </a>
</li> </li>
<li> <li>
<a onClick="window.external.openUrl('https://github.com/momo5502/open-iw5');" class="nav-link"> <a onClick="window.external.openUrl('https://github.com/momo5502/iw5-mod');" class="nav-link">
GitHub GitHub
</a> </a>
</li> </li>

View File

@ -112,7 +112,7 @@ namespace steam
// Generate the authentication ticket // Generate the authentication ticket
const auto id = this->GetSteamID(); const auto id = this->GetSteamID();
auth_ticket = "Open-IW5"; auth_ticket = "iw5-mod";
auth_ticket.resize(32); auth_ticket.resize(32);
auth_ticket.append(reinterpret_cast<char*>(pUserData), cbUserData); auth_ticket.append(reinterpret_cast<char*>(pUserData), cbUserData);
auth_ticket.append(reinterpret_cast<const char*>(&id.bits), sizeof(id.bits)); auth_ticket.append(reinterpret_cast<const char*>(&id.bits), sizeof(id.bits));