XLabsProject-Mirror/s1x-client
1
0
Fork 0
mirror of https://github.com/XLabsProject/s1x-client.git synced 2023-08-02 15:02:12 +02:00
Code Issues Releases Activity

Merge pull request #1 from OneFourOne/master

Browse Source 
More cleanup
This commit is contained in:
quaK 2021-02-16 18:34:45 +02:00 committed by GitHub
commit d27753c87f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/component/branding.cpp
View File

@ -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");

2
src/client/component/dedicated_info.cpp
View File

@ -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;
}

2
src/client/component/filesystem.cpp
View File

@ -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);
}
};
}

2
src/client/component/game_console.cpp
View File

@ -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;

6
src/client/component/splash.cpp
View File

@ -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<LPCSTR>(102));
wnd_class.hCursor = LoadCursorA(nullptr, IDC_APPSTARTING);
wnd_class.hbrBackground = reinterpret_cast<HBRUSH>(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,

4
src/client/component/steam_proxy.cpp
View File

@ -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<const unsigned int*>(mod_id) | 0x80000000;
this->client_user_.invoke<bool>("SpawnProcess", path.data(), cmdline.data(), our_directory,

2
src/client/launcher/launcher.cpp
View File

@ -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();
}

2
src/client/main.cpp
View File

@ -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);

12
src/client/resource.rc
View File

@ -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

6
src/client/resources/main.html
View File

@ -461,10 +461,10 @@
<div class="container full full-row">
<div style="text-align: center; width: 100%;">
<h1>S1-Mod: Pre-Release</h1>
<h1>S1x: Pre-Release</h1>
<p>Developed by <a onClick="window.external.openUrl('https://xlabs.dev');">X Labs</a>.<br>Big thanks to all the contributors.</p>
<p>
Join us on <a onClick="window.external.openUrl('https://discord.gg/sKeVmR3');">Discord</a>.<br> Follow the project on <a onClick="window.external.openUrl('https://github.com/joelrau/s1-mod');">GitHub</a>.
Join us on <a onClick="window.external.openUrl('https://discord.gg/sKeVmR3');">Discord</a>.<br> Follow the project on <a onClick="window.external.openUrl('https://github.com/XLabsProject/s1x-client');">GitHub</a>.
</p>
</div>
</div>
@ -523,4 +523,4 @@
</script>
</body>
</html>
</html>