crashing issues fixed

Fixed random crashes occurring while ESP is active. Tested extensively on several maps without crash reports. I believe the issue is resolved
This commit is contained in:
Jadis0x
2024-06-28 19:12:21 +03:00
parent a462aa0afc
commit c99f820fa6
5 changed files with 51 additions and 26 deletions

View File

@@ -21,6 +21,28 @@ bool IsHost()
return app::BoltNetwork_get_IsServer(NULL); return app::BoltNetwork_get_IsServer(NULL);
} }
app::Survival* GetSurvivalObject()
{
static app::Survival* cachedSurvival = nullptr;
if (cachedSurvival == nullptr || Object::IsNull((app::Object_1*)cachedSurvival)) {
cachedSurvival = Object::FindObjectOfType<app::Survival>("Survival");
}
return cachedSurvival;
}
app::OptionsHelpers* GetOptionsHelpersObject()
{
static app::OptionsHelpers* cachedOptionsHelpers = nullptr;
if (cachedOptionsHelpers == nullptr || Object::IsNull((app::Object_1*)cachedOptionsHelpers)) {
cachedOptionsHelpers = Object::FindObjectOfType<app::OptionsHelpers>("OptionsHelpers");
}
return cachedOptionsHelpers;
}
bool IsLocalPlayer(app::NolanBehaviour* player) bool IsLocalPlayer(app::NolanBehaviour* player)
{ {
auto boltEntity = app::EntityBehaviour_get_entity((app::EntityBehaviour*)player, NULL); auto boltEntity = app::EntityBehaviour_get_entity((app::EntityBehaviour*)player, NULL);
@@ -59,7 +81,7 @@ bool IsPlayerCrawling(app::GameObject* go)
bool IsInGame() bool IsInGame()
{ {
app::OptionsHelpers* optionsHelpers = Object::FindObjectOfType<app::OptionsHelpers>("OptionsHelpers"); app::OptionsHelpers* optionsHelpers = GetOptionsHelpersObject();
if (optionsHelpers) if (optionsHelpers)
return optionsHelpers->fields._inGame_k__BackingField; return optionsHelpers->fields._inGame_k__BackingField;
@@ -69,20 +91,17 @@ bool IsInGame()
bool IsSequencePlaying() bool IsSequencePlaying()
{ {
app::Survival* survival = Object::FindObjectOfType<app::Survival>("Survival"); app::Survival* survival = GetSurvivalObject();
// Return false if the object was not found. // Return false if the object was not found.
if (survival == nullptr) return false; if (survival == nullptr) return false;
if (app::Survival_IsEndingPlaying != nullptr || app::Survival_IsJumpScarePlaying != nullptr || app::Survival_StartingToPlayFailEnding != nullptr) { // Check if any of the sequences are playing and return the result directly.
bool isEndingPlaying = app::Survival_IsEndingPlaying(survival, nullptr); if (app::Survival_IsEndingPlaying && app::Survival_IsEndingPlaying(survival, nullptr)) return true;
bool isJumpScarePlaying = app::Survival_IsJumpScarePlaying(survival, nullptr); if (app::Survival_IsJumpScarePlaying && app::Survival_IsJumpScarePlaying(survival, nullptr)) return true;
bool isStartingToPlayFailEnding = app::Survival_StartingToPlayFailEnding(survival, nullptr); if (app::Survival_StartingToPlayFailEnding && app::Survival_StartingToPlayFailEnding(survival, nullptr)) return true;
// Return true if any sequence is playing.
return isEndingPlaying || isJumpScarePlaying || isStartingToPlayFailEnding;
}
// If none of the sequences are playing, return false.
return false; return false;
} }
@@ -98,6 +117,7 @@ app::GameObject* GetAzazel(app::Survival* survival)
} }
std::string SceneName() std::string SceneName()
{ {
if (app::SaveHelpers_get_singleton != nullptr) { if (app::SaveHelpers_get_singleton != nullptr) {

View File

@@ -4,15 +4,14 @@
bool IsSinglePlayer(); bool IsSinglePlayer();
bool IsOnline(); bool IsOnline();
bool IsHost(); bool IsHost();
app::Survival* GetSurvivalObject();
app::OptionsHelpers* GetOptionsHelpersObject();
bool IsLocalPlayer(app::NolanBehaviour* player); bool IsLocalPlayer(app::NolanBehaviour* player);
bool IsPlayerCrawling(); bool IsPlayerCrawling();
bool IsPlayerCrawling(app::GameObject* go); bool IsPlayerCrawling(app::GameObject* go);
bool IsInGame(); bool IsInGame();
bool IsSequencePlaying(); bool IsSequencePlaying();
app::GameObject* GetAzazel(app::Survival* survival); app::GameObject* GetAzazel(app::Survival* survival);
std::string SceneName(); std::string SceneName();
std::string GetAzazelName(); std::string GetAzazelName();
float Time_DeltaTime(); float Time_DeltaTime();

View File

@@ -20,6 +20,10 @@ namespace Transform {
{ {
if (!component) return nullptr; if (!component) return nullptr;
if (app::Component_get_transform != nullptr) {
return app::Component_get_transform((app::Component*)component, nullptr); return app::Component_get_transform((app::Component*)component, nullptr);
} }
return nullptr;
}
} }

View File

@@ -78,7 +78,7 @@ void DrawNameESP(app::Vector3 pos, std::string name, ImColor color)
void ComputePositionAndDrawESP(app::Object_1__Array* ents, ImColor color, bool use_prefab = false, std::string name = "") { void ComputePositionAndDrawESP(app::Object_1__Array* ents, ImColor color, bool use_prefab = false, std::string name = "") {
for (int i = 0; i < ents->max_length; i++) { for (int i = 0; i < ents->max_length; i++) {
app::Object_1 *ent = ents->vector[i]; app::Object_1 *ent = ents->vector[i];
if (ent == nullptr) if (Object::IsNull(ent))
continue; continue;
app::Transform* _transform = Transform::GetTransform(ent); app::Transform* _transform = Transform::GetTransform(ent);
@@ -144,14 +144,14 @@ void ESP::RunItemsESP() {
ImColor col = ImColor{ settings::item_esp_color[0], settings::item_esp_color[1], settings::item_esp_color[2], settings::item_esp_color[3] }; ImColor col = ImColor{ settings::item_esp_color[0], settings::item_esp_color[1], settings::item_esp_color[2], settings::item_esp_color[3] };
app::Object_1__Array *ents = Object::FindObjectsOfType("SurvivalInteractable", ""); app::Object_1__Array *ents = Object::FindObjectsOfType("SurvivalInteractable", "");
if (ents != nullptr && ents->vector[0] != nullptr) { if (ents != nullptr || !Object::IsNull(ents->vector[0])) {
ComputePositionAndDrawESP(ents, col, true); ComputePositionAndDrawESP(ents, col, true);
} }
if (SceneName() != "Menu") if (SceneName() != "Menu")
return; return;
ents = Object::FindObjectsOfType("KeyBehaviour", ""); ents = Object::FindObjectsOfType("KeyBehaviour", "");
if (ents != nullptr && ents->vector[0] != nullptr) { if (ents != nullptr || !Object::IsNull(ents->vector[0])) {
ComputePositionAndDrawESP(ents, col, false, "Key"); ComputePositionAndDrawESP(ents, col, false, "Key");
} }
} }
@@ -159,7 +159,7 @@ void ESP::RunItemsESP() {
void ESP::RunGoatsESP() { void ESP::RunGoatsESP() {
app::Object_1__Array *goats = Object::FindObjectsOfType("GoatBehaviour", ""); app::Object_1__Array *goats = Object::FindObjectsOfType("GoatBehaviour", "");
if (goats == nullptr || goats->vector[0] == nullptr) if (goats == nullptr || Object::IsNull(goats->vector[0]))
return; return;
ComputePositionAndDrawESP(goats, ImColor{ settings::goat_esp_color[0], settings::goat_esp_color[1], settings::goat_esp_color[2], settings::goat_esp_color[3] }); ComputePositionAndDrawESP(goats, ImColor{ settings::goat_esp_color[0], settings::goat_esp_color[1], settings::goat_esp_color[2], settings::goat_esp_color[3] });

View File

@@ -766,6 +766,7 @@ HRESULT __stdcall hookD3D11Present(IDXGISwapChain* pSwapChain, UINT SyncInterval
if (settings::player_esp) if (settings::player_esp)
ESP::RunPlayersESP(); ESP::RunPlayersESP();
if (IsInGame() && !IsSequencePlaying()) {
if (settings::goat_esp && SceneName() != "Menu") if (settings::goat_esp && SceneName() != "Menu")
ESP::RunGoatsESP(); ESP::RunGoatsESP();
@@ -777,6 +778,7 @@ HRESULT __stdcall hookD3D11Present(IDXGISwapChain* pSwapChain, UINT SyncInterval
if (settings::azazel_esp && SceneName() != "Menu") if (settings::azazel_esp && SceneName() != "Menu")
ESP::RunAzazelESP(); ESP::RunAzazelESP();
}
ImGui::GetIO().MouseDrawCursor = open_menu; ImGui::GetIO().MouseDrawCursor = open_menu;