maint(branding): rename

This commit is contained in:
Diavolo 2023-06-18 16:07:39 +02:00
parent 94e9429926
commit 3f3cfc0be8
No known key found for this signature in database
GPG Key ID: FA77F074E98D98A5
9 changed files with 18 additions and 19 deletions

View File

@ -32,7 +32,6 @@
| `-dump` | Write info of loaded assets to the raw folder as they are being loaded. | | `-dump` | Write info of loaded assets to the raw folder as they are being loaded. |
| `-nointro` | Skip game's cinematic intro. | | `-nointro` | Skip game's cinematic intro. |
| `-version` | Print IW4x build info on startup. | | `-version` | Print IW4x build info on startup. |
| `-zonebuilder` | Start the interactive zonebuilder tool console instead of starting the game. |
| `-nosteam` | Disable friends feature and do not update Steam about the game's current status just like an invisible mode. | | `-nosteam` | Disable friends feature and do not update Steam about the game's current status just like an invisible mode. |
| `-unprotect-dvars` | Allow the server to modify saved/archive dvars. | | `-unprotect-dvars` | Allow the server to modify saved/archive dvars. |

View File

@ -10,9 +10,9 @@ namespace Components
Dvar::Var Branding::CGDrawVersionY; Dvar::Var Branding::CGDrawVersionY;
#ifdef _DEBUG #ifdef _DEBUG
constexpr auto* BUILD_TYPE = "IW4x_DEV MP"; constexpr auto* BUILD_TYPE = "IW4y_DEV MP";
#else #else
constexpr auto* BUILD_TYPE = "IW4x MP"; constexpr auto* BUILD_TYPE = "IW4y MP";
#endif #endif
void Branding::CG_DrawVersion() void Branding::CG_DrawVersion()
@ -101,7 +101,10 @@ namespace Components
RegisterBrandingDvars(); RegisterBrandingDvars();
// UI version string // UI version string
Utils::Hook::Set<const char*>(0x43F73B, "IW4x " REVISION_STR); Utils::Hook::Set<const char*>(0x43F73B, "IW4y " REVISION_STR);
// Window title
Utils::Hook::Set<const char*>(0x5076A0, "IW4y: Multiplayer");
// Short version dvar // Short version dvar
Utils::Hook::Set<const char*>(0x60BD91, REVISION_STR); Utils::Hook::Set<const char*>(0x60BD91, REVISION_STR);
@ -138,14 +141,14 @@ namespace Components
if (Dedicated::IsEnabled()) if (Dedicated::IsEnabled())
{ {
#ifdef EXPERIMENTAL_BUILD #ifdef EXPERIMENTAL_BUILD
Utils::Hook::Set<const char*>(0x4289E8, "IW4x " REVISION_STR "-develop: Dedicated"); Utils::Hook::Set<const char*>(0x4289E8, "IW4y " REVISION_STR "-develop: Dedicated");
#else #else
Utils::Hook::Set<const char*>(0x4289E8, "IW4x " REVISION_STR ": Dedicated"); Utils::Hook::Set<const char*>(0x4289E8, "IW4y " REVISION_STR ": Dedicated");
#endif #endif
} }
else else
{ {
Utils::Hook::Set<const char*>(0x4289E8, "IW4x (" REVISION_STR "): Console"); Utils::Hook::Set<const char*>(0x4289E8, "IW4y (" REVISION_STR "): Console");
} }
} }
} }

View File

@ -99,9 +99,9 @@ namespace Components
else if (IsWindow(GetWindow()) != FALSE) else if (IsWindow(GetWindow()) != FALSE)
{ {
#ifdef EXPERIMENTAL_BUILD #ifdef EXPERIMENTAL_BUILD
SetWindowTextA(GetWindow(), Utils::String::Format("IW4x " REVISION_STR "-develop : {}", hostname)); SetWindowTextA(GetWindow(), Utils::String::Format("IW4y " REVISION_STR "-develop : {}", hostname));
#else #else
SetWindowTextA(GetWindow(), Utils::String::Format("IW4x " REVISION_STR " : {}", hostname)); SetWindowTextA(GetWindow(), Utils::String::Format("IW4y " REVISION_STR " : {}", hostname));
#endif #endif
} }
} }
@ -862,9 +862,9 @@ namespace Components
// Console '%s: %s> ' string // Console '%s: %s> ' string
#ifdef EXPERIMENTAL_BUILD #ifdef EXPERIMENTAL_BUILD
Utils::Hook::Set<const char*>(0x5A44B4, "IW4x MP: " REVISION_STR "-develop> "); Utils::Hook::Set<const char*>(0x5A44B4, "IW4y MP: " REVISION_STR "-develop> ");
#else #else
Utils::Hook::Set<const char*>(0x5A44B4, "IW4x MP: " REVISION_STR "> "); Utils::Hook::Set<const char*>(0x5A44B4, "IW4y MP: " REVISION_STR "> ");
#endif #endif
// Patch console color // Patch console color

View File

@ -158,10 +158,11 @@ namespace Components
{ {
"NTAuthority", "NTAuthority",
"aerosoul94", "aerosoul94",
"FutureRave",
"ReactIW4", "ReactIW4",
"IW4Play", "IW4Play",
"V2", "V2",
"luckyy" "luckyy",
}; };
std::string credits = "^2The IW4x Team:^7\n"; std::string credits = "^2The IW4x Team:^7\n";

View File

@ -2,7 +2,7 @@
#include "Changelog.hpp" #include "Changelog.hpp"
#include "News.hpp" #include "News.hpp"
#define NEWS_MOTD_DEFAULT "Welcome to IW4x Multiplayer!" #define NEWS_MOTD_DEFAULT "Welcome to IW4y Multiplayer!"
namespace Components namespace Components
{ {

View File

@ -339,9 +339,6 @@ namespace Components
// fs_basegame // fs_basegame
Utils::Hook::Set<const char*>(0x6431D1, BASEGAME); Utils::Hook::Set<const char*>(0x6431D1, BASEGAME);
// window title
Utils::Hook::Set<const char*>(0x5076A0, "IW4x: Multiplayer");
// sv_hostname // sv_hostname
Utils::Hook::Set<const char*>(0x4D378B, "IW4Host"); Utils::Hook::Set<const char*>(0x4D378B, "IW4Host");

View File

@ -17,7 +17,7 @@ namespace Components
{ {
if (Flags::HasFlag("version")) if (Flags::HasFlag("version"))
{ {
printf("%s", "IW4x " VERSION " (built " __DATE__ " " __TIME__ ")\n"); printf("%s", "IW4y " VERSION " (built " __DATE__ " " __TIME__ ")\n");
#ifdef EXPERIMENTAL_BUILD #ifdef EXPERIMENTAL_BUILD
printf("Revision: %i - develop\n", REVISION); printf("Revision: %i - develop\n", REVISION);
#else #else

View File

@ -130,7 +130,7 @@ namespace Steam
} }
else else
{ {
Proxy::SetMod("IW4x: Modern Warfare 2"); Proxy::SetMod("IW4y: Modern Warfare 2");
Proxy::RunGame(); Proxy::RunGame();
} }

View File

@ -30,7 +30,6 @@ namespace Utils
if (!i) if (!i)
{ {
// Prepend here, as /dev/urandom says so ;) https://github.com/IW4x/iw4x-client-node/wikis/technical-information#incrementing-the-token
this->tokenString = std::basic_string<std::uint8_t>(reinterpret_cast<std::uint8_t*>(const_cast<char*>("\0")), 1) + this->tokenString; this->tokenString = std::basic_string<std::uint8_t>(reinterpret_cast<std::uint8_t*>(const_cast<char*>("\0")), 1) + this->tokenString;
break; break;
} }