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

Browse Source
This commit is contained in:
momo5502
2015-12-27 14:05:08 +01:00
parent 412dbe3d33
commit b8a94cbf22
9 changed files with 41 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
iw4/Components/Command.hpp
View File

@ -8,6 +8,7 @@ namespace Components
public:
Params(DWORD id) : CommandId(id) {};
Params(const Params &obj) { this->CommandId = obj.CommandId; };
Params() : Params(*Game::cmd_id) {};
char* operator[](size_t index);
size_t Length();

9
iw4/Components/Console.cpp
View File

@ -2,6 +2,12 @@
namespace Components
{
char** Console::GetAutoCompleteFileList(const char *path, const char *extension, Game::FsListBehavior_e behavior, int *numfiles, int allocTrackType)
{
if (path == (char*)0xBAADF00D) return nullptr;
return Game::FS_ListFiles(path, extension, behavior, numfiles, allocTrackType);
}
void Console::ToggleConsole()
{
// possibly cls.keyCatchers?
@ -25,5 +31,8 @@ namespace Components
// Internal console
Utils::Hook(0x4F690C, Console::ToggleConsole, HOOK_CALL).Install()->Quick();
Utils::Hook(0x4F65A5, Console::ToggleConsole, HOOK_JUMP).Install()->Quick();
// Check for bad food ;)
Utils::Hook(0x4CB9F4, Console::GetAutoCompleteFileList, HOOK_CALL).Install()->Quick();
}
}

1
iw4/Components/Console.hpp
View File

@ -8,5 +8,6 @@ namespace Components
private:
static void ToggleConsole();
static char** GetAutoCompleteFileList(const char *path, const char *extension, Game::FsListBehavior_e behavior, int *numfiles, int allocTrackType);
};
}

33
iw4/Components/Party.cpp
View File

@ -9,10 +9,10 @@ namespace Components
{
SteamID id;
id.m_comp.m_unAccountID = Game::Com_Milliseconds();
id.m_comp.m_EUniverse = 1;
id.m_comp.m_EAccountType = 8;
id.m_comp.m_unAccountInstance = 0x40000;
id.AccountID = Game::Com_Milliseconds();
id.Universe = 1;
id.AccountType = 8;
id.AccountInstance = 0x40000;
return id;
}
@ -31,9 +31,9 @@ namespace Components
const char* Party::GetLobbyInfo(SteamID lobby, std::string key)
{
if (Party::LobbyMap.find(lobby.m_Bits) != Party::LobbyMap.end())
if (Party::LobbyMap.find(lobby.Bits) != Party::LobbyMap.end())
{
Network::Address address = Party::LobbyMap[lobby.m_Bits];
Network::Address address = Party::LobbyMap[lobby.Bits];
if (key == "addr")
{
@ -50,21 +50,12 @@ namespace Components
void Party::RemoveLobby(SteamID lobby)
{
if (Party::LobbyMap.find(lobby.m_Bits) != Party::LobbyMap.end())
if (Party::LobbyMap.find(lobby.Bits) != Party::LobbyMap.end())
{
Party::LobbyMap.erase(Party::LobbyMap.find(lobby.m_Bits));
Party::LobbyMap.erase(Party::LobbyMap.find(lobby.Bits));
}
}
Game::netadr_t* PartyHost_GetMemberAddressBySlotInState(int unk, void *party, const int slot)
{
Game::netadr_t* addr = Game::PartyHost_GetMemberAddressBySlot(unk, party, slot);
OutputDebugStringA(Network::Address(addr).GetString());
return addr;
}
Party::Party()
{
// various changes to SV_DirectConnect-y stuff to allow non-party joinees
@ -106,8 +97,6 @@ namespace Components
Utils::Hook::Nop(0x5AF851, 5);
Utils::Hook::Set<BYTE>(0x5AF85B, 0xEB);
Utils::Hook(0x5B5544, PartyHost_GetMemberAddressBySlotInState, HOOK_CALL).Install()->Quick();
Command::Add("connect", [] (Command::Params params)
{
if (params.Length() < 2)
@ -129,9 +118,9 @@ namespace Components
SteamID id = Party::GenerateLobbyId();
Party::LobbyMap[id.m_Bits] = address;
Party::LobbyMap[id.Bits] = address;
OutputDebugStringA(Utils::VA("Mapping %llX -> %s", id.m_Bits, address.GetString()));
OutputDebugStringA(Utils::VA("Mapping %llX -> %s", id.Bits, address.GetString()));
Game::Steam_JoinLobby(id, 0);
@ -174,7 +163,7 @@ namespace Components
info.Set("mapname", Dvar::Var("mapname").Get<const char*>());
info.Set("gametype", Dvar::Var("g_gametype").Get<const char*>());
info.Set("fs_game", Dvar::Var("fs_game").Get<const char*>());
info.Set("xuid", Utils::VA("%llX", Steam::SteamUser()->GetSteamID().m_Bits));
info.Set("xuid", Utils::VA("%llX", Steam::SteamUser()->GetSteamID().Bits));
info.Set("clients", Utils::VA("%i", clientCount));
info.Set("sv_maxclients", Utils::VA("%i", *Game::svs_numclients));