From ed4d373ba777da438152f5c6424758cd23456908 Mon Sep 17 00:00:00 2001 From: BenCat07 Date: Sun, 29 Apr 2018 09:01:38 +0200 Subject: [PATCH] Playerlist fix --- src/playerlist.cpp | 10 +--------- src/reclasses/CTFInventoryManager.cpp | 6 +++--- src/reclasses/CTFPartyClient.cpp | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) mode change 100755 => 100644 src/playerlist.cpp diff --git a/src/playerlist.cpp b/src/playerlist.cpp old mode 100755 new mode 100644 index 4daef66a..88668741 --- a/src/playerlist.cpp +++ b/src/playerlist.cpp @@ -140,15 +140,7 @@ rgba_t Color(CachedEntity *player) userdata &AccessData(unsigned steamid) { - try - { - return data.at(steamid); - } - catch (std::out_of_range &oor) - { - data.emplace(steamid, userdata{}); - return data.at(steamid); - } + return data[steamid]; } // Assume player is non-null diff --git a/src/reclasses/CTFInventoryManager.cpp b/src/reclasses/CTFInventoryManager.cpp index bb8a2ca6..d0f04b14 100644 --- a/src/reclasses/CTFInventoryManager.cpp +++ b/src/reclasses/CTFInventoryManager.cpp @@ -12,7 +12,7 @@ CTFInventoryManager *CTFInventoryManager::GTFInventoryManager() typedef CTFInventoryManager *(*GTFInventoryManager_t)(); uintptr_t address = gSignatures.GetClientSignature( "55 A1 ? ? ? ? 89 E5 5D C3 8D B6 00 00 00 00 55 89 E5 56 53 83 EC ? 8B " - "5D ? C7 44 24 ? ? ? ? ?"); + "5D ? C7 44 24"); GTFInventoryManager_t GTFInventoryManager_fn = GTFInventoryManager_t(address); return GTFInventoryManager_fn(); @@ -34,7 +34,7 @@ CTFPlayerInventory *CTFPlayerInventory::GTFPlayerInventory() typedef CTFPlayerInventory *(*GTFPlayerInventory_t)(); uintptr_t address = gSignatures.GetClientSignature( "55 B8 ? ? ? ? 89 E5 5D C3 8D B6 00 00 00 00 55 B8 ? ? ? ? 89 E5 5D C3 " - "8D B6 00 00 00 00 55 89 E5 57 56 53 83 EC ? 8B 45 ? 8B 5D ?"); + "8D B6 00 00 00 00 55 89 E5 57 56 53 83 EC ? 8B 45 ? 8B 5D"); GTFPlayerInventory_t GTFPlayerInventory_fn = GTFPlayerInventory_t(address); return GTFPlayerInventory_fn(); } @@ -42,7 +42,7 @@ CEconItem *CTFPlayerInventory::GetFirstItemOfItemDef(int id) { typedef CEconItem *(*GetFirstItemOfItemDef_t)(CTFPlayerInventory *, int); uintptr_t address = gSignatures.GetClientSignature( - "55 89 E5 57 56 53 83 EC ? 8B 4D ? 0F B7 45 ?"); + "55 89 E5 57 56 53 83 EC ? 8B 4D ? 0F B7 45"); GetFirstItemOfItemDef_t GetFirstItemOfItemDef_fn = GetFirstItemOfItemDef_t(address); return GetFirstItemOfItemDef_fn(this, id); diff --git a/src/reclasses/CTFPartyClient.cpp b/src/reclasses/CTFPartyClient.cpp index 4078e5fd..951bdac3 100644 --- a/src/reclasses/CTFPartyClient.cpp +++ b/src/reclasses/CTFPartyClient.cpp @@ -46,8 +46,8 @@ re::CTFPartyClient::MutLocalGroupCriteria(re::CTFPartyClient *client) { typedef re::ITFGroupMatchCriteria *(*MutLocalGroupCriteria_t)( re::CTFPartyClient *); - static uintptr_t addr = gSignatures.GetClientSignature( - "55 89 E5 8B 45 ? 8B 50 ? C6 80"); + static uintptr_t addr = + gSignatures.GetClientSignature("55 89 E5 8B 45 ? 8B 50 ? C6 80"); static MutLocalGroupCriteria_t MutLocalGroupCriteria_fn = MutLocalGroupCriteria_t(addr);