[Merge] develop -> feature/steam-avatars

This commit is contained in:
momo5502
2017-06-05 11:23:09 +02:00
4 changed files with 21 additions and 7 deletions

View File

@ -70,7 +70,7 @@ namespace Components
Loader::Register(new Monitor());
Loader::Register(new Network());
Loader::Register(new Theatre());
Loader::Register(new Clantags());
//Loader::Register(new Clantags());
Loader::Register(new Download());
Loader::Register(new Playlist());
Loader::Register(new RawFiles());

View File

@ -35,10 +35,15 @@ namespace Components
Game::SV_GameSendServerCommand(-1, 0, command.data());
}
const char* Clantags::GetUserClantag(std::uint32_t clientnum, const char* playername)
const char* Clantags::GetUserClantag(std::uint32_t /*clientnum*/, const char* playername)
{
#if 0
if (Clantags::Tags[clientnum].empty()) return playername;
return Utils::String::VA("[%s] %s", Clantags::Tags[clientnum].data(), playername);
#else
return playername;
#endif
}
__declspec(naked) void Clantags::DrawPlayerNameOnScoreboard()

View File

@ -347,6 +347,11 @@ namespace Components
Utils::Hook::Set<BYTE>(0x4D3C67, 0); // ?
Utils::Hook::Set<DWORD>(0x4D3C69, 1000);
// Manually register sv_network_fps
Utils::Hook::Nop(0x4D3C7B, 5);
Utils::Hook::Nop(0x4D3C8E, 5);
*reinterpret_cast<Game::dvar_t**>(0x62C7C00) = Dvar::Register<int>("sv_network_fps", 1000, 20, 1000, Game::dvar_flag::DVAR_FLAG_NONE, "Number of times per second the server checks for net messages").get<Game::dvar_t*>();
// r_loadForRenderer default to 0
Utils::Hook::Set<BYTE>(0x519DDF, 0);
@ -388,7 +393,7 @@ namespace Components
interval.update();
CardTitles::SendCustomTitlesToClients();
Clantags::SendClantagsToClients();
//Clantags::SendClantagsToClients();
}
});