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

Minor fixes

Browse Source
This commit is contained in:
joelrau 2021-02-16 18:48:45 +02:00
parent d27753c87f
commit 4e54f95c01
7 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,7 @@ namespace branding
if (game::environment::is_mp())
{
localized_strings::override("LUA_MENU_MULTIPLAYER_CAPS", "S1-MOD: MULTIPLAYER\n");
localized_strings::override("LUA_MENU_MULTIPLAYER_CAPS", "S1x: MULTIPLAYER\n");
}
localized_strings::override("LUA_MENU_LEGAL_COPYRIGHT", "S1x: " VERSION);

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

@ -20,7 +20,7 @@ namespace demonware
void bd_logger_stub(const char* const function, const char* const msg, ...)
{
static auto* enabled =
game::Dvar_RegisterBool("bd_logger_enabled", false, game::DVAR_FLAG_NONE, "bdLogger");
game::Dvar_RegisterBool("bd_logger_enabled", false, game::DVAR_FLAG_SAVED, "bdLogger");
if (!enabled->current.enabled)
{
return;
@ -393,6 +393,8 @@ namespace demonware
utils::hook::set<uint8_t>(0x140698BB2, 0x0); // CURLOPT_SSL_VERIFYPEER
utils::hook::set<uint8_t>(0x140698B69, 0xAF); // CURLOPT_SSL_VERIFYHOST
utils::hook::set<uint8_t>(0x14088D0E8, 0x0); // HTTPS -> HTTP
utils::hook::set<uint8_t>(0x140437CC0, 0xC3); // SV_SendMatchData
}
void pre_destroy() override

1
src/client/component/patches.cpp
View File

@ -136,7 +136,6 @@ namespace patches
if (file.exists())
{
snprintf(buf, size, "%s\n", file.get_buffer().data());
printf("%s\n", buf);
return buf;
}

10
src/client/component/videos.cpp
View File

@ -72,14 +72,14 @@ namespace videos
if (game::environment::is_mp())
{
replace("menus_bg_comp2", "menus_bg_s1-mod");
replace("mp_menus_bg_options", "menus_bg_s1-mod_blur");
replace("menus_bg_comp2", "menus_bg_s1x");
replace("mp_menus_bg_options", "menus_bg_s1x_blur");
}
else if (game::environment::is_sp())
{
replace("sp_menus_bg_main_menu", "menus_bg_s1-mod_sp");
replace("sp_menus_bg_campaign", "menus_bg_s1-mod_sp");
replace("sp_menus_bg_options", "menus_bg_s1-mod_sp");
replace("sp_menus_bg_main_menu", "menus_bg_s1x_sp");
replace("sp_menus_bg_campaign", "menus_bg_s1x_sp");
replace("sp_menus_bg_options", "menus_bg_s1x_sp");
}
}
};

6
src/client/game/demonware/service.hpp
View File

@ -37,13 +37,15 @@ public:
if (it != this->tasks_.end())
{
std::cout << "demonware::" << name_ << ": executing task '" << utils::string::va("%d", this->task_id_) << "'\n";
#ifdef DEBUG
printf("demonware::%s: executing task '%d'\n", name_.data(), this->task_id_);
#endif
it->second(server, &buffer);
}
else
{
std::cout << "demonware::" << name_ << ": missing task '" << utils::string::va("%d", this->task_id_) << "'\n";
printf("demonware::%s: missing task '%d'\n", name_.data(), this->task_id_);
// return no error
server->create_reply(this->task_id_)->send();

4
src/client/game/demonware/services/bdStorage.cpp
View File

@ -15,11 +15,11 @@ namespace demonware
this->register_task(13, &bdStorage::unk13);
this->map_publisher_resource("motd-.*\\.txt", DW_MOTD);
this->map_publisher_resource("ffotd-*\\.ff", DW_FASTFILE);
//this->map_publisher_resource("ffotd-.*\\.ff", DW_FASTFILE);
this->map_publisher_resource("playlists(_.+)?\\.aggr", DW_PLAYLISTS);
this->map_publisher_resource("social_[Tt][Uu][0-9]+\\.cfg", DW_SOCIAL_CONFIG);
this->map_publisher_resource("mm\\.cfg", DW_MM_CONFIG);
this->map_publisher_resource("entitlement_config_[Tt][Uu][0-9]+\\.info", DW_ENTITLEMENT_CONFIG);
this->map_publisher_resource("entitlement_config\\.info", DW_ENTITLEMENT_CONFIG);
this->map_publisher_resource("codPointStoreConfig_[Tt][Uu][0-9]+\\.csv", DW_CODPOINTS_CONFIG);
this->map_publisher_resource("lootConfig_[Tt][Uu][0-9]+\\.csv", DW_LOOT_CONFIG);
this->map_publisher_resource("winStoreConfig_[Tt][Uu][0-9]+\\.csv", DW_STORE_CONFIG);

2
src/client/game/game.hpp
View File

@ -5,7 +5,7 @@
#define SELECT_VALUE(sp, mp) (game::environment::is_sp() ? (sp) : (mp))
#define SERVER_CD_KEY "S1MOD-CD-Key"
#define SERVER_CD_KEY "S1X-CD-Key"
namespace game
{