[LineEndings] Fix them all
This commit is contained in:
@ -481,8 +481,8 @@ namespace Components
|
|||||||
Utils::Hook(0x51C76C, AntiCheat::CinematicStub, HOOK_CALL).install()->quick();
|
Utils::Hook(0x51C76C, AntiCheat::CinematicStub, HOOK_CALL).install()->quick();
|
||||||
Utils::Hook(0x418209, AntiCheat::SoundInitStub, HOOK_CALL).install()->quick();
|
Utils::Hook(0x418209, AntiCheat::SoundInitStub, HOOK_CALL).install()->quick();
|
||||||
Utils::Hook(0x60BE9D, AntiCheat::SoundInitStub, HOOK_CALL).install()->quick();
|
Utils::Hook(0x60BE9D, AntiCheat::SoundInitStub, HOOK_CALL).install()->quick();
|
||||||
Utils::Hook(0x60BE8E, AntiCheat::SoundInitDriverStub, HOOK_CALL).install()->quick();
|
Utils::Hook(0x60BE8E, AntiCheat::SoundInitDriverStub, HOOK_CALL).install()->quick();
|
||||||
Utils::Hook(0x418204, AntiCheat::SoundInitDriverStub, HOOK_CALL).install()->quick();
|
Utils::Hook(0x418204, AntiCheat::SoundInitDriverStub, HOOK_CALL).install()->quick();
|
||||||
Renderer::OnFrame(AntiCheat::PerformScan);
|
Renderer::OnFrame(AntiCheat::PerformScan);
|
||||||
|
|
||||||
// Detect aimbots
|
// Detect aimbots
|
||||||
|
@ -104,9 +104,9 @@ namespace Components
|
|||||||
Utils::Hook::Set<int>(0x631EBC, sizeof(Game::newMapArena_t));
|
Utils::Hook::Set<int>(0x631EBC, sizeof(Game::newMapArena_t));
|
||||||
Utils::Hook::Set<int>(0x6327AF, sizeof(Game::newMapArena_t));
|
Utils::Hook::Set<int>(0x6327AF, sizeof(Game::newMapArena_t));
|
||||||
|
|
||||||
Utils::Hook(0x420720, ArenaLength::ArenaMapOffsetHook1, HOOK_JUMP).install()->quick();
|
Utils::Hook(0x420720, ArenaLength::ArenaMapOffsetHook1, HOOK_JUMP).install()->quick();
|
||||||
Utils::Hook(0x49BD39, ArenaLength::ArenaMapOffsetHook2, HOOK_JUMP).install()->quick();
|
Utils::Hook(0x49BD39, ArenaLength::ArenaMapOffsetHook2, HOOK_JUMP).install()->quick();
|
||||||
Utils::Hook(0x632799, ArenaLength::ArenaMapOffsetHook3, HOOK_JUMP).install()->quick();
|
Utils::Hook(0x632799, ArenaLength::ArenaMapOffsetHook3, HOOK_JUMP).install()->quick();
|
||||||
Utils::Hook(0x4064B2, ArenaLength::ArenaMapOffsetHook4, HOOK_JUMP).install()->quick();
|
Utils::Hook(0x4064B2, ArenaLength::ArenaMapOffsetHook4, HOOK_JUMP).install()->quick();
|
||||||
|
|
||||||
Utils::Hook::Set<BYTE>(0x4A95F8, 32);
|
Utils::Hook::Set<BYTE>(0x4A95F8, 32);
|
||||||
|
@ -248,7 +248,7 @@ namespace Components
|
|||||||
}
|
}
|
||||||
|
|
||||||
offset->pointer = *reinterpret_cast<void**>(pointer);
|
offset->pointer = *reinterpret_cast<void**>(pointer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AssetHandler::ZoneSave(Game::XAsset asset, ZoneBuilder::Zone* builder)
|
void AssetHandler::ZoneSave(Game::XAsset asset, ZoneBuilder::Zone* builder)
|
||||||
{
|
{
|
||||||
|
@ -195,7 +195,7 @@ namespace Components
|
|||||||
__asm
|
__asm
|
||||||
{
|
{
|
||||||
push ebx
|
push ebx
|
||||||
push [esp + 8h] // Index
|
push[esp + 8h] // Index
|
||||||
push esi // Color ref
|
push esi // Color ref
|
||||||
call Colors::LookupColor
|
call Colors::LookupColor
|
||||||
add esp, 8h
|
add esp, 8h
|
||||||
|
@ -492,7 +492,7 @@ namespace Components
|
|||||||
// "\r\n"
|
// "\r\n"
|
||||||
// "Hi fella!<br>You are%s connected to this server!", (Download::IsClient(nc) ? " " : " not"));
|
// "Hi fella!<br>You are%s connected to this server!", (Download::IsClient(nc) ? " " : " not"));
|
||||||
//
|
//
|
||||||
// Game::client_t* client = Download::GetClient(nc);
|
// Game::client_t* client = Download::GetClient(nc);
|
||||||
//
|
//
|
||||||
// if (client)
|
// if (client)
|
||||||
// {
|
// {
|
||||||
@ -539,7 +539,7 @@ namespace Components
|
|||||||
"\r\n", mimeType.data(), buffer.size());
|
"\r\n", mimeType.data(), buffer.size());
|
||||||
|
|
||||||
mg_send(nc, buffer.data(), static_cast<int>(buffer.size()));
|
mg_send(nc, buffer.data(), static_cast<int>(buffer.size()));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
mg_printf(nc,
|
mg_printf(nc,
|
||||||
|
@ -513,7 +513,7 @@ namespace Components
|
|||||||
|
|
||||||
Game::XAssetHeader Menus::MenuFileLoad(Game::XAssetType type, std::string filename)
|
Game::XAssetHeader Menus::MenuFileLoad(Game::XAssetType type, std::string filename)
|
||||||
{
|
{
|
||||||
Game::XAssetHeader header = { 0 };
|
Game::XAssetHeader header = { 0 };
|
||||||
|
|
||||||
Game::MenuList* menuList = Game::DB_FindXAssetHeader(type, filename.data()).menuList;
|
Game::MenuList* menuList = Game::DB_FindXAssetHeader(type, filename.data()).menuList;
|
||||||
header.menuList = menuList;
|
header.menuList = menuList;
|
||||||
|
@ -372,6 +372,8 @@ namespace Components
|
|||||||
Party::Container.matchType = atoi(info.get("matchtype").data());
|
Party::Container.matchType = atoi(info.get("matchtype").data());
|
||||||
uint32_t securityLevel = static_cast<uint32_t>(atoi(info.get("securityLevel").data()));
|
uint32_t securityLevel = static_cast<uint32_t>(atoi(info.get("securityLevel").data()));
|
||||||
|
|
||||||
|
std::string mod = Dvar::Var("fs_game").get<std::string>();
|
||||||
|
|
||||||
if (info.get("challenge") != Party::Container.challenge)
|
if (info.get("challenge") != Party::Container.challenge)
|
||||||
{
|
{
|
||||||
Party::ConnectError("Invalid join response: Challenge mismatch.");
|
Party::ConnectError("Invalid join response: Challenge mismatch.");
|
||||||
@ -390,7 +392,7 @@ namespace Components
|
|||||||
{
|
{
|
||||||
Party::ConnectError("Invalid join response: Unknown matchtype");
|
Party::ConnectError("Invalid join response: Unknown matchtype");
|
||||||
}
|
}
|
||||||
else if(!info.get("fs_game").empty() && Utils::String::ToLower(Dvar::Var("fs_game").get<std::string>()) != Utils::String::ToLower(info.get("fs_game")))
|
else if(!info.get("fs_game").empty() && Utils::String::ToLower(mod) != Utils::String::ToLower(info.get("fs_game")))
|
||||||
{
|
{
|
||||||
Command::Execute("closemenu popup_reconnectingtoparty");
|
Command::Execute("closemenu popup_reconnectingtoparty");
|
||||||
Download::InitiateClientDownload(info.get("fs_game"));
|
Download::InitiateClientDownload(info.get("fs_game"));
|
||||||
|
@ -89,8 +89,8 @@ namespace Components
|
|||||||
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2), static_cast<float>(height - bHeight / 2 - border), bWidth * 1.0f, border * 1.0f, 0, 0, 1.0f, 1.0f, borderColor, white); // Top
|
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2), static_cast<float>(height - bHeight / 2 - border), bWidth * 1.0f, border * 1.0f, 0, 0, 1.0f, 1.0f, borderColor, white); // Top
|
||||||
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2), static_cast<float>(height + bHeight / 2), bWidth * 1.0f, border * 1.0f, 0, 0, 1.0f, 1.0f, borderColor, white); // Bottom
|
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2), static_cast<float>(height + bHeight / 2), bWidth * 1.0f, border * 1.0f, 0, 0, 1.0f, 1.0f, borderColor, white); // Bottom
|
||||||
|
|
||||||
// Image
|
// Image
|
||||||
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2 + iOffsetLeft), static_cast<float>(height - bHeight / 2 + iOffset), imgDim * 1.0f, imgDim * 1.0f, 0, 0, 1.0f, 1.0f, wColor, image);
|
Game::CL_DrawStretchPicPhysical(static_cast<float>(width / 2 - bWidth / 2 + iOffsetLeft), static_cast<float>(height - bHeight / 2 + iOffset), imgDim * 1.0f, imgDim * 1.0f, 0, 0, 1.0f, 1.0f, wColor, image);
|
||||||
|
|
||||||
// Text
|
// Text
|
||||||
float leftText = width / 2 - bWidth / 2 - cornerSize + iOffsetLeft * 2 + imgDim;
|
float leftText = width / 2 - bWidth / 2 - cornerSize + iOffsetLeft * 2 + imgDim;
|
||||||
|
@ -55,7 +55,7 @@ namespace Utils
|
|||||||
stream.next_out = dest;
|
stream.next_out = dest;
|
||||||
|
|
||||||
ret = inflate(&stream, Z_NO_FLUSH);
|
ret = inflate(&stream, Z_NO_FLUSH);
|
||||||
if (ret != Z_OK && ret != Z_STREAM_END)
|
if (ret != Z_OK && ret != Z_STREAM_END)
|
||||||
{
|
{
|
||||||
inflateEnd(&stream);
|
inflateEnd(&stream);
|
||||||
return "";
|
return "";
|
||||||
|
@ -40,6 +40,7 @@ namespace Utils
|
|||||||
{
|
{
|
||||||
HMODULE hntdll = GetModuleHandleA("ntdll.dll");
|
HMODULE hntdll = GetModuleHandleA("ntdll.dll");
|
||||||
if (!hntdll) return false;
|
if (!hntdll) return false;
|
||||||
|
|
||||||
return (GetProcAddress(hntdll, "wine_get_version") != nullptr);
|
return (GetProcAddress(hntdll, "wine_get_version") != nullptr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user