From f1e853f339fba7e5fec83bc440a51bfd646ddd92 Mon Sep 17 00:00:00 2001 From: BenCat07 Date: Sat, 26 Oct 2019 11:19:17 +0200 Subject: [PATCH 1/2] Rework GC queue system --- src/hacks/Achievement.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/hacks/Achievement.cpp b/src/hacks/Achievement.cpp index a899f59f..ea3df6cc 100644 --- a/src/hacks/Achievement.cpp +++ b/src/hacks/Achievement.cpp @@ -231,10 +231,15 @@ void CreateMove() { if (gc_queue.size() && gc_timer.test_and_set(3000)) { - queue_struct item = gc_queue.at(gc_queue.size() - 1); - auto invmng = re::CTFInventoryManager::GTFInventoryManager(); - invmng->EquipItemInLoadout(item.clazz, item.slot, item.uuid); - gc_queue.pop_back(); + int i = 0; + while (gc_queue.size() && i < 10) + { + queue_struct item = gc_queue.at(gc_queue.size() - 1); + auto invmng = re::CTFInventoryManager::GTFInventoryManager(); + invmng->EquipItemInLoadout(item.clazz, item.slot, item.uuid); + gc_queue.pop_back(); + i++; + } } if (!hat_troll) return; From 2e68e73758c632d51947c921dd5a265c460c554c Mon Sep 17 00:00:00 2001 From: bencat07 Date: Sat, 26 Oct 2019 16:28:17 +0200 Subject: [PATCH 2/2] Use for loop instead --- src/hacks/Achievement.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hacks/Achievement.cpp b/src/hacks/Achievement.cpp index ea3df6cc..a8a40bab 100644 --- a/src/hacks/Achievement.cpp +++ b/src/hacks/Achievement.cpp @@ -231,14 +231,12 @@ void CreateMove() { if (gc_queue.size() && gc_timer.test_and_set(3000)) { - int i = 0; - while (gc_queue.size() && i < 10) + for (int i = 0; i < 10 && gc_queue.size(); i++) { queue_struct item = gc_queue.at(gc_queue.size() - 1); auto invmng = re::CTFInventoryManager::GTFInventoryManager(); invmng->EquipItemInLoadout(item.clazz, item.slot, item.uuid); gc_queue.pop_back(); - i++; } } if (!hat_troll)