diff --git a/DL2GameOverhaulScript/source/core.cpp b/DL2GameOverhaulScript/source/core.cpp index da2b0fa..5758fcc 100644 --- a/DL2GameOverhaulScript/source/core.cpp +++ b/DL2GameOverhaulScript/source/core.cpp @@ -1,7 +1,3 @@ -#include -#include -#include -#include #include "ImGui\impl\d3d11_impl.h" #include "ImGui\impl\d3d12_impl.h" #include "config\config.h" @@ -10,6 +6,10 @@ #include "kiero.h" #include "menu\menu.h" #include "sigscan\offsets.h" +#include +#include +#include +#include #pragma region KeyBindOption bool KeyBindOption::wasAnyKeyPressed = false; diff --git a/DL2GameOverhaulScript/source/game_classes.cpp b/DL2GameOverhaulScript/source/game_classes.cpp index c72c209..c3c10ed 100644 --- a/DL2GameOverhaulScript/source/game_classes.cpp +++ b/DL2GameOverhaulScript/source/game_classes.cpp @@ -1,6 +1,3 @@ -#include -#include -#include #include "config\config.h" #include "game_classes.h" #include "memory.h" @@ -10,6 +7,9 @@ #include "print.h" #include "sigscan\offsets.h" #include "utils.h" +#include +#include +#include namespace Core { extern void OnPostUpdate(); @@ -247,20 +247,25 @@ namespace GamePH { } #pragma endregion*/ -/*#pragma region PossibleLoadScrFile +#pragma region PossibleLoadScrFile static LPVOID GetPossibleLoadScrFile() { return reinterpret_cast(reinterpret_cast(GetModuleHandle("gamedll_ph_x64_rwdi.dll")) + 0x171D830); } static Hook::MHook PossibleLoadScrFileHook{ &GetPossibleLoadScrFile, &detourPossibleLoadScrFile }; static DWORD64 detourPossibleLoadScrFile(char* file, const char* a2, char a3, DWORD64 a4, DWORD64 a5, DWORD64 a6, char a7, DWORD64 a8, DWORD64 a9) { + std::string_view fileName = std::string_view(file); + if (!strcmp(file, "jump_parameters.scr")) { - char file2[] = "C:\\Users\\EricPlayZ\\Desktop\\jump_parameters.scr"; - return PossibleLoadScrFileHook.pOriginal(file2, a2, true, a4, a5, a6, a7, a8, a9); + char file2[] = "out\\settings\\EGameTools\\jump_parameters.scr"; + return PossibleLoadScrFileHook.pOriginal(file2, a2, a3, a4, a5, a6, a7, a8, a9); + } else if (fileName.contains("default_weather_config.scr")) { + char file2[] = "out\\settings\\EGameTools\\jump_parameters.scr"; + return PossibleLoadScrFileHook.pOriginal(file2, a2, a3, a4, a5, a6, a7, a8, a9); } return PossibleLoadScrFileHook.pOriginal(file, a2, a3, a4, a5, a6, a7, a8, a9); } -#pragma endregion*/ +#pragma endregion #pragma endregion #pragma region OtherFuncs diff --git a/DL2GameOverhaulScript/source/utils.cpp b/DL2GameOverhaulScript/source/utils.cpp index a5f0885..9ff2c26 100644 --- a/DL2GameOverhaulScript/source/utils.cpp +++ b/DL2GameOverhaulScript/source/utils.cpp @@ -1,6 +1,6 @@ +#include "utils.h" #include #include -#include "utils.h" namespace Utils { Timer::Timer(long timeMs) : timeToPass(timeMs), timePassed(false) { @@ -45,12 +45,19 @@ namespace Utils { } std::string_view GetDesktopDir() { - char path[MAX_PATH + 1]; + char path[MAX_PATH + 1]{}; if (!SHGetSpecialFolderPathA(HWND_DESKTOP, path, CSIDL_DESKTOP, FALSE)) return {}; return path; } + std::string_view GetDocumentsDir() { + char path[MAX_PATH + 1]{}; + if (SHGetFolderPathA(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, path) != S_OK) + return {}; + + return path; + } WindowsVersion GetWindowsVersion() { OSVERSIONINFOEX info{}; DWORDLONG dwlConditionMask = 0; diff --git a/DL2GameOverhaulScript/source/utils.h b/DL2GameOverhaulScript/source/utils.h index 25b17cb..4de9e2f 100644 --- a/DL2GameOverhaulScript/source/utils.h +++ b/DL2GameOverhaulScript/source/utils.h @@ -36,5 +36,6 @@ namespace Utils { extern FARPROC GetProcAddr(std::string_view module, std::string_view funcName); extern std::string_view GetDesktopDir(); + extern std::string_view GetDocumentsDir(); extern WindowsVersion GetWindowsVersion(); } \ No newline at end of file