Improve safety and validation in gameplay and rendering processes #5
There are no files selected for viewing
Binary file not shown.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -73,6 +73,7 @@ struct AimbotSettingsstruct { | |
| bool Prediction = false; | ||
| float PredictionMultiplier = 1.0f; | ||
| bool TargetLock = true; | ||
| bool TargetSurrendered = false; | ||
|
There was a problem hiding this comment. 🗄️ Data Integrity & Integration | 🟡 Minor | ⚡ Quick win Migrate existing
Add a settings version and migrate legacy records, or reject legacy 🤖 Prompt for AI Agents |
||
| } inline AimbotSettings; | ||
|
|
||
| struct SilentAimSettingsstruct { | ||
|
|
@@ -158,7 +159,7 @@ struct Cheats | |
| static void InstaKill(); | ||
| static void RenderESP(); | ||
| static void SetPlayerSpeed(); | ||
| static void SilentAim(Params::BaseMagazineWeapon_Server_OnFire* FireParams); | ||
| static void AddMag(); | ||
| static void ArrestAll(ETeam Team); // Arrest all of a specific team | ||
| static void ProcessArrestQueue(); | ||
|
|
@@ -176,4 +177,4 @@ struct Cheats | |
| static void SurrenderAll(ETeam Team); // Surrender all of a specific team | ||
| static void AntiSway(); | ||
| static void GiveAchievements(); | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| #include "pch.h" | ||
| #include "Engine.h" | ||
| #include <kiero/kiero.h> | ||
|
|
||
| #define MAJORVERSION 2 | ||
| #define MINORVERSION 5 | ||
|
|
@@ -115,8 +113,22 @@ static const std::pair<const char*, int> KeyNames[] = { | |
| {"OemClear", VK_OEM_CLEAR} | ||
| }; | ||
|
|
||
| static int FindKeyIndex(int VirtualKey) | ||
| { | ||
| for (int Index = 0; Index < IM_ARRAYSIZE(KeyNames); ++Index) | ||
| { | ||
| if (KeyNames[Index].second == VirtualKey) | ||
| return Index; | ||
| } | ||
|
|
||
| return 0; | ||
| } | ||
|
|
||
| bool KeyGetter(void* Data, int Index, const char** OutText) | ||
| { | ||
| if (!Data || !OutText || Index < 0 || Index >= IM_ARRAYSIZE(KeyNames)) | ||
| return false; | ||
|
|
||
| auto* Items = static_cast<std::pair<const char*, int>*>(Data); | ||
| *OutText = Items[Index].first; | ||
| return true; | ||
|
|
@@ -262,7 +274,12 @@ HRESULT __stdcall Engine::hkPresent(IDXGISwapChain* SwapChain, UINT SyncInterval | |
| return Engine::oPresent(SwapChain, SyncInterval, Flags); | ||
| } | ||
|
|
||
| if (!Engine::InitImGui()) | ||
| { | ||
| printf("[hkPresent] Failed to initialize ImGui\n"); | ||
| return Engine::oPresent(SwapChain, SyncInterval, Flags); | ||
| } | ||
|
Comment on lines
+277
to
+281
There was a problem hiding this comment. 🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win 🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
ast-grep outline ReadyOrNot/Init.cpp --items all
rg -n -C 8 'InitImGui|pDevice|pContext|GetDevice|GetImmediateContext|Release|DestroyContext' \
ReadyOrNot/Init.cpp ReadyOrNot/DLLMain.cppRepository: peachmarrow13/ReadyOrNot Length of output: 11233 🏁 Script executed: #!/bin/bash
set -euo pipefail
cat -n ReadyOrNot/Init.cpp | sed -n '48,112p'
cat -n ReadyOrNot/DLLMain.cpp | sed -n '240,290p'
rg -n -C 5 'ImGui_Impl|InitImGui\(|`#if`|`#ifdef`|throw|return false|return true' ReadyOrNot/Init.cpp ReadyOrNot/DLLMain.cpp ReadyOrNot/*.h
python3 - <<'PY'
from pathlib import Path
text = Path("ReadyOrNot/Init.cpp").read_text()
start = text.index("bool Engine::InitImGui()")
end = text.index("\nvoid SetStyle()", start)
body = text[start:end]
print("InitImGui return, release, and context operations:")
for i, line in enumerate(body.splitlines(), 1):
if any(token in line for token in ("return", "Release", "CreateContext", "throw")):
print(f"{i:03}: {line}")
PYRepository: peachmarrow13/ReadyOrNot Length of output: 13217 Release COM interfaces on initialization failure.
🤖 Prompt for AI Agents |
||
| printf("[hkPresent] ImGui initialized successfully\n"); | ||
|
|
||
| if (hwnd) | ||
| oWndProc = (WNDPROC)SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)WndProc); | ||
|
|
@@ -361,7 +378,11 @@ HRESULT __stdcall Engine::hkPresent(IDXGISwapChain* SwapChain, UINT SyncInterval | |
| CVars.QueuedAction = EQueuedAction::ToggleInfAmmo; | ||
| HostOnlyTooltip(); | ||
|
|
||
| if (ImGui::InputInt("Multi Fire", &CVars.MultiFire, 0, 50)) | ||
| { | ||
| if (CVars.MultiFire < 0) CVars.MultiFire = 0; | ||
| if (CVars.MultiFire > 20) CVars.MultiFire = 20; | ||
| } | ||
|
|
||
| if (ImGui::Button("Remove Recoil")) | ||
| CVars.QueuedAction = EQueuedAction::RemoveRecoil; | ||
|
|
@@ -480,6 +501,8 @@ HRESULT __stdcall Engine::hkPresent(IDXGISwapChain* SwapChain, UINT SyncInterval | |
|
|
||
| ImGui::Checkbox("Target Arrested", &AimbotSettings.TargetArrested); | ||
|
|
||
| ImGui::Checkbox("Target Surrendered", &AimbotSettings.TargetSurrendered); | ||
|
|
||
| ImGui::Checkbox("Target All", &AimbotSettings.TargetAll); | ||
|
|
||
| ImGui::SliderFloat("Max Distance", &AimbotSettings.MaxDistance, 0.0f, 300.0f, "%.1f"); | ||
|
|
@@ -625,14 +648,14 @@ HRESULT __stdcall Engine::hkPresent(IDXGISwapChain* SwapChain, UINT SyncInterval | |
|
|
||
| if (ImGui::TreeNode("Misc Settings")) | ||
| { | ||
| static int MenuButtonCurrentIndex = FindKeyIndex(MiscSettings.MenuButton); | ||
|
|
||
| if (ImGui::Combo("Menu Toggle Key", &MenuButtonCurrentIndex, KeyGetter, (void*)KeyNames, IM_ARRAYSIZE(KeyNames))) | ||
| { | ||
| MiscSettings.MenuButton = KeyNames[MenuButtonCurrentIndex].second; | ||
| } | ||
|
|
||
| static int UninjectButtonCurrentIndex = FindKeyIndex(MiscSettings.UninjectButton); | ||
|
|
||
| if (ImGui::Combo("Uninject Key", &UninjectButtonCurrentIndex, KeyGetter, (void*)KeyNames, IM_ARRAYSIZE(KeyNames))) | ||
| { | ||
|
|
@@ -847,8 +870,9 @@ HRESULT __stdcall Engine::hkPresent(IDXGISwapChain* SwapChain, UINT SyncInterval | |
| return Engine::oPresent ? Engine::oPresent(SwapChain, SyncInterval, Flags) : S_OK; | ||
| } | ||
|
|
||
| static DWORD WINAPI MainThread(LPVOID Parameter) | ||
| { | ||
| HMODULE hModule = static_cast<HMODULE>(Parameter); | ||
| AllocConsole(); | ||
| FILE* Dummy; | ||
| freopen_s(&Dummy, "CONOUT$", "w", stdout); | ||
|
|
@@ -889,7 +913,13 @@ static DWORD MainThread(HMODULE hModule) | |
|
|
||
| LoadSettings(); | ||
|
|
||
| if (!Hooks::HookProcessEvent()) | ||
| { | ||
| printf("[ERROR] Failed to initialize ProcessEvent hook.\n"); | ||
| Cleaning.store(true); | ||
| Cleanup(hModule); | ||
| return 1; | ||
| } | ||
|
|
||
| while (!Cleaning.load()) | ||
| Sleep(100); | ||
|
|
@@ -904,7 +934,8 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD reason, LPVOID lpReserved) { | |
| switch (reason) { | ||
| case DLL_PROCESS_ATTACH: | ||
| DisableThreadLibraryCalls(hModule); | ||
| if (HANDLE MainThreadHandle = CreateThread(nullptr, 0, MainThread, hModule, 0, nullptr)) | ||
| CloseHandle(MainThreadHandle); | ||
| break; | ||
| case DLL_PROCESS_DETACH: | ||
| Cleaning.store(true); | ||
|
|
@@ -1145,14 +1176,11 @@ void Cleanup(HMODULE hModule) | |
| } | ||
|
|
||
| if (Engine::pContext) { | ||
| Engine::pContext->OMSetRenderTargets(0, nullptr, nullptr); | ||
| Engine::pContext->ClearState(); | ||
| Engine::pContext->Flush(); | ||
| } | ||
|
|
||
| if (Engine::pRenderTargetView) | ||
| { | ||
| Engine::pRenderTargetView->Release(); | ||
|
|
@@ -1179,4 +1207,4 @@ void Cleanup(HMODULE hModule) | |
| // Clean up console | ||
| FreeConsole(); | ||
| FreeLibraryAndExitThread(hModule, 0); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,7 +127,7 @@ auto RenderColor = IM_COL32(255, 255, 255, 255); | |
| void Cheats::RenderESP() | ||
| { | ||
| if (!CVars.ESP) return; | ||
| if (!GVars.PlayerController || !GVars.Level || !GVars.POV) return; | ||
|
|
||
| ULevel* Level = GVars.Level; | ||
| if (!Level) return; | ||
|
|
@@ -137,7 +137,7 @@ void Cheats::RenderESP() | |
|
|
||
| for (AActor* Actor : ActorsCopy) | ||
| { | ||
| if (!Actor || !Utils::IsValidActor(Actor)) continue; | ||
|
|
||
| if (ESPSettings.ShowTraps) | ||
| { | ||
|
|
@@ -255,6 +255,7 @@ void Cheats::RenderESP() | |
| memcpy(SuspectSkeletonBones, SuspectSkeletonBones_1, sizeof(SuspectSkeletonBones_1)); | ||
|
|
||
| std::vector<FVector2D> BonePositions = {}; | ||
| bool HasVisibleBone = !ESPSettings.LOS; | ||
|
|
||
| for (auto& pair : IsSuspect ? SuspectSkeletonBones : CivilianSkeletonBones) | ||
| { | ||
|
|
@@ -263,7 +264,7 @@ void Cheats::RenderESP() | |
|
|
||
| FVector ParentPos = Mesh->GetBoneTransform(ParentName, ERelativeTransformSpace::RTS_World).Translation; | ||
| FVector ChildPos = Mesh->GetBoneTransform(ChildName, ERelativeTransformSpace::RTS_World).Translation; | ||
| FVector2D ParentScreen, ChildScreen; | ||
|
|
||
| if (ESPSettings.LOS) | ||
| { | ||
|
|
@@ -289,64 +290,69 @@ void Cheats::RenderESP() | |
| 1.0f | ||
| ); | ||
|
|
||
| auto* HitComponent = HitResult.Component.Get(); | ||
| AActor* HitActor = HitComponent ? HitComponent->GetOwner() : nullptr; | ||
|
|
||
| bool bHasLOS = !HitResult.bBlockingHit || HitActor == TargetActor; | ||
| if (!bHasLOS) | ||
| continue; | ||
|
|
||
| HasVisibleBone = true; | ||
| } | ||
|
|
||
| if ((ESPSettings.Bones || ESPSettings.ShowBox) && | ||
| Utils::SafeProjectWorldLocationToScreen(GVars.PlayerController, ParentPos, &ParentScreen, true) && | ||
| Utils::SafeProjectWorldLocationToScreen(GVars.PlayerController, ChildPos, &ChildScreen, true)) | ||
| { | ||
| if (ESPSettings.ShowBox) | ||
| { | ||
| BonePositions.push_back(ParentScreen); | ||
| BonePositions.push_back(ChildScreen); | ||
| } | ||
|
|
||
| if (ESPSettings.Bones) | ||
| { | ||
| GVars.PlayerController->GetViewportSize(&ViewportX, &ViewportY); | ||
| if (ParentScreen.X == 0.f && ParentScreen.Y == 0.f or ParentScreen.X > ViewportX or ParentScreen.Y > ViewportY) continue; | ||
| ImGui::GetBackgroundDrawList()->AddLine( | ||
| ImVec2(ParentScreen.X, ParentScreen.Y), | ||
| ImVec2(ChildScreen.X, ChildScreen.Y), | ||
| RenderColor, | ||
| 1.5f | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (HasVisibleBone && ESPSettings.ShowEnemyDistance) | ||
| { | ||
| FVector ActorLocation = TargetActor->K2_GetActorLocation(); | ||
| float Distance = GVars.POV->Location.GetDistanceToInMeters(ActorLocation); | ||
| FVector2D DistanceScreen; | ||
| if (Distance >= 0.0f && Utils::SafeProjectWorldLocationToScreen(GVars.PlayerController, ActorLocation, &DistanceScreen, true)) | ||
| { | ||
| char DistanceText[32]; | ||
| snprintf(DistanceText, sizeof(DistanceText), "%.1f m", Distance); | ||
| ImGui::GetBackgroundDrawList()->AddText( | ||
| ImVec2(DistanceScreen.X, DistanceScreen.Y + 35), | ||
| RenderColor, | ||
| DistanceText | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| FVector2D ActorScreen; | ||
| if (HasVisibleBone && ESPSettings.ShowTeam && IsPlayer && TargetActor->PlayerState && TargetActor->PlayerState->GetPlayerName() && | ||
| Utils::SafeProjectWorldLocationToScreen(GVars.PlayerController, Actor->K2_GetActorLocation(), &ActorScreen, true)) | ||
| { | ||
| ImGui::GetBackgroundDrawList()->AddText( | ||
| ImVec2(ActorScreen.X, ActorScreen.Y + 50), | ||
| RenderColor, | ||
| TargetActor->PlayerState->GetPlayerName().ToString().c_str() | ||
| ); | ||
| } | ||
|
|
||
| if (ESPSettings.ShowBox && !BonePositions.empty()) | ||
| { | ||
| FVector2D TopLeft, BottomRight; | ||
|
|
||
|
|
@@ -374,4 +380,4 @@ void Cheats::RenderESP() | |
| ); | ||
| } | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win
Document the required
Release|x64platform.OutDirandTargetNameare configured only forRelease|x64inReadyOrNot/ReadyOrNot.vcxproj, Lines 73-76. The README currently says onlyRelease, so aRelease|Win32build does not guaranteeBuild/ReadyOrNot.dll. Update the build step to specifyRelease|x64.Proposed documentation fix
📝 Committable suggestion
🤖 Prompt for AI Agents