diff --git a/src/client/component/branding.cpp b/src/client/component/branding.cpp index b499fb4..9d12f36 100644 --- a/src/client/component/branding.cpp +++ b/src/client/component/branding.cpp @@ -40,9 +40,9 @@ namespace branding { localized_strings::override("LUA_MENU_MULTIPLAYER_CAPS", "S1-MOD: MULTIPLAYER\n"); } - localized_strings::override("LUA_MENU_LEGAL_COPYRIGHT", "S1-Mod: " VERSION); + localized_strings::override("LUA_MENU_LEGAL_COPYRIGHT", "S1x: " VERSION); - dvars::override::Dvar_SetString("version", utils::string::va("S1-Mod %s", VERSION)); + dvars::override::Dvar_SetString("version", utils::string::va("S1x %s", VERSION)); ui_get_formatted_build_number_hook.create(SELECT_VALUE(0x14035B3F0, 0x1404A8950), ui_get_formatted_build_number_stub); @@ -52,7 +52,7 @@ namespace branding const auto y = 4; const auto scale = 1.0f; float color[4] = { 0.666f, 0.666f, 0.666f, 0.666f }; - const auto* text = "S1-Mod: " VERSION; + const auto* text = "S1x: " VERSION; auto* font = game::R_RegisterFont("fonts/normalfont"); diff --git a/src/client/component/dedicated_info.cpp b/src/client/component/dedicated_info.cpp index 5e0db8d..384b853 100644 --- a/src/client/component/dedicated_info.cpp +++ b/src/client/component/dedicated_info.cpp @@ -22,7 +22,7 @@ namespace dedicated_info auto* sv_running = game::Dvar_FindVar("sv_running"); if (!sv_running || !sv_running->current.enabled) { - console::set_title("S1-Mod Dedicated Server"); + console::set_title("S1x Dedicated Server"); return; } diff --git a/src/client/component/filesystem.cpp b/src/client/component/filesystem.cpp index 9334442..26b46cc 100644 --- a/src/client/component/filesystem.cpp +++ b/src/client/component/filesystem.cpp @@ -44,7 +44,7 @@ namespace filesystem void post_unpack() override { // Set fs_basegame - dvars::override::Dvar_RegisterString("fs_basegame", "s1-mod", 2048); + dvars::override::Dvar_RegisterString("fs_basegame", "S1x", 2048); } }; } diff --git a/src/client/component/game_console.cpp b/src/client/component/game_console.cpp index 0418401..c09570e 100644 --- a/src/client/component/game_console.cpp +++ b/src/client/component/game_console.cpp @@ -232,7 +232,7 @@ namespace game_console con.globals.left_x = con.screen_min[0] + 6.0f; draw_input_box(1, dvars::con_inputBoxColor->current.vector); - draw_input_text_and_over("S1-MOD: " VERSION ">", color_s1); + draw_input_text_and_over("S1x: " VERSION ">", color_s1); con.globals.left_x = con.globals.x; con.globals.auto_complete_choice[0] = 0; diff --git a/src/client/component/splash.cpp b/src/client/component/splash.cpp index a4d279d..4981699 100644 --- a/src/client/component/splash.cpp +++ b/src/client/component/splash.cpp @@ -70,7 +70,7 @@ namespace splash { ShowWindow(this->window_, SW_HIDE); DestroyWindow(this->window_); - UnregisterClassA("S1-Mod Splash Screen", utils::nt::library{}); + UnregisterClassA("S1x Splash Screen", utils::nt::library{}); } } @@ -89,7 +89,7 @@ namespace splash wnd_class.hIcon = LoadIconA(self, reinterpret_cast(102)); wnd_class.hCursor = LoadCursorA(nullptr, IDC_APPSTARTING); wnd_class.hbrBackground = reinterpret_cast(6); - wnd_class.lpszClassName = "S1-Mod Splash Screen"; + wnd_class.lpszClassName = "S1x Splash Screen"; if (RegisterClassA(&wnd_class)) { @@ -98,7 +98,7 @@ namespace splash if (image_) { - this->window_ = CreateWindowExA(WS_EX_APPWINDOW, "S1-Mod Splash Screen", "S1-Mod", + this->window_ = CreateWindowExA(WS_EX_APPWINDOW, "S1x Splash Screen", "S1x", WS_POPUP | WS_SYSMENU, (x_pixels - 320) / 2, (y_pixels - 100) / 2, 320, 100, nullptr, nullptr, diff --git a/src/client/component/steam_proxy.cpp b/src/client/component/steam_proxy.cpp index 216a151..6a3c3b0 100644 --- a/src/client/component/steam_proxy.cpp +++ b/src/client/component/steam_proxy.cpp @@ -42,7 +42,7 @@ namespace steam_proxy #ifndef DEV_BUILD try { - this->start_mod("\xF0\x9F\x90\xA4" " S1-Mod: "s + (game::environment::is_sp() ? "Singleplayer" : "Multiplayer"), game::environment::is_sp() ? 209650 : 209660); + this->start_mod("\xF0\x9F\x90\xA4" " S1x: "s + (game::environment::is_sp() ? "Singleplayer" : "Multiplayer"), game::environment::is_sp() ? 209650 : 209660); } catch (std::exception& e) { @@ -142,7 +142,7 @@ namespace steam_proxy game_id.raw.type = 1; // k_EGameIDTypeGameMod game_id.raw.app_id = app_id & 0xFFFFFF; - const auto* mod_id = "S1-Mod"; + const auto* mod_id = "S1x"; game_id.raw.mod_id = *reinterpret_cast(mod_id) | 0x80000000; this->client_user_.invoke("SpawnProcess", path.data(), cmdline.data(), our_directory, diff --git a/src/client/launcher/launcher.cpp b/src/client/launcher/launcher.cpp index b20309f..72b9996 100644 --- a/src/client/launcher/launcher.cpp +++ b/src/client/launcher/launcher.cpp @@ -46,7 +46,7 @@ void launcher::create_main_menu() return DefWindowProcA(*window, message, w_param, l_param); }); - this->main_window_.create("S1-Mod", 750, 420); + this->main_window_.create("S1x", 750, 420); this->main_window_.load_html(load_content(MENU_MAIN)); this->main_window_.show(); } diff --git a/src/client/main.cpp b/src/client/main.cpp index c5fe52c..5f43858 100644 --- a/src/client/main.cpp +++ b/src/client/main.cpp @@ -84,7 +84,7 @@ FARPROC load_binary(const launcher::mode mode) if (!utils::io::read_file(binary, &data)) { throw std::runtime_error(utils::string::va( - "Failed to read game binary (%s)!\nPlease copy the s1-mod.exe into your Call of Duty: Advanced Warfare installation folder and run it from there.", binary.data())); + "Failed to read game binary (%s)!\nPlease copy the s1x.exe into your Call of Duty: Advanced Warfare installation folder and run it from there.", binary.data())); } return loader.load_library(binary); diff --git a/src/client/resource.rc b/src/client/resource.rc index 7d65005..e7e116f 100644 --- a/src/client/resource.rc +++ b/src/client/resource.rc @@ -71,14 +71,14 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "X Labs" - VALUE "FileDescription", "s1-mod" + VALUE "FileDescription", "S1x" VALUE "FileVersion", VERSION_FILE - VALUE "InternalName", "S1MOD" - VALUE "LegalCopyright", "Copyright (C) 2020 X Labs Project. All rights reserved." + VALUE "InternalName", "S1x" + VALUE "LegalCopyright", "Copyright (C) 2021 X Labs Project. All rights reserved." VALUE "Licence", "GPLv3" - VALUE "Info", "https://github.com/Joelrau/iw7-mod" - VALUE "OriginalFilename", "s1-mod.exe" - VALUE "ProductName", "s1-mod" + VALUE "Info", "https://github.com/XLabsProject/s1x-client" + VALUE "OriginalFilename", "s1x.exe" + VALUE "ProductName", "s1x" VALUE "ProductVersion", VERSION_PRODUCT END END diff --git a/src/client/resources/main.html b/src/client/resources/main.html index 0b34230..cc99e64 100644 --- a/src/client/resources/main.html +++ b/src/client/resources/main.html @@ -461,10 +461,10 @@
-

S1-Mod: Pre-Release

+

S1x: Pre-Release

Developed by X Labs.
Big thanks to all the contributors.

- Join us on Discord.
Follow the project on GitHub. + Join us on Discord.
Follow the project on GitHub.

@@ -523,4 +523,4 @@ - \ No newline at end of file +