Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

[LineEndings] Fix them all

Browse Source
This commit is contained in:
momo5502
2017-01-19 22:23:59 +01:00
parent 07b0a42f45
commit 74b34f2a6d
150 changed files with 28075 additions and 28072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Components/Modules/Colors.cpp
View File

@ -195,7 +195,7 @@ namespace Components
__asm
{
push ebx
push [esp + 8h] // Index
push[esp + 8h] // Index
push esi // Color ref
call Colors::LookupColor
add esp, 8h

4
src/Components/Modules/Party.cpp
View File

@ -372,6 +372,8 @@ namespace Components
Party::Container.matchType = atoi(info.get("matchtype").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)
{
Party::ConnectError("Invalid join response: Challenge mismatch.");
@ -390,7 +392,7 @@ namespace Components
{
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");
Download::InitiateClientDownload(info.get("fs_game"));

1
src/Utils/Utils.cpp
View File

@ -40,6 +40,7 @@ namespace Utils
{
HMODULE hntdll = GetModuleHandleA("ntdll.dll");
if (!hntdll) return false;
return (GetProcAddress(hntdll, "wine_get_version") != nullptr);
}
}