Minor fixes

CheatMenu/Game.cpp

@@ -490,8 +490,12 @@ Lowers armour, health, stamina etc."))
 
 			if (!m_bMissionLoaderWarningShown)
 			{
-				ImGui::TextWrapped("Mission loader might cause unintended changes to your game. \
-It's recommanded not to save your game after using this. Use it at your own risk!");
+				ImGui::TextWrapped("Mission loader may cause,\n\
+1. Game crashes\n\
+2. Break save games\n\
+3. Break game progression\n\
+4. Random bugs & glitches\n\n\
+It's recommanded not to save after using the mission loader. Use it at your own risk!");
 				ImGui::Spacing();
 				if (ImGui::Button("Show mission loader", ImVec2(Ui::GetSize())))
 					m_bMissionLoaderWarningShown = true;
@@ -513,7 +517,7 @@ It's recommanded not to save your game after using this. Use it at your own risk
 		}
 		if (ImGui::BeginTabItem("Stats"))
 		{
-			// similat to Ui::DrawJSON()
+			// similar to Ui::DrawJSON()
 			ImGui::Spacing();
 
 			ImGui::PushItemWidth(ImGui::GetContentRegionAvailWidth() / 2 - 5);

CheatMenu/Hook.cpp

@@ -215,11 +215,6 @@ static BOOL __stdcall _SetCursorPos(int X, int Y)
 	return SetCursorPos(X, Y);
 }
 
-int __cdecl _psMouseSetPos(RwV2d* pos)
-{
-	return _SetCursorPos(pos->x, pos->y);
-}
-
 static LRESULT __stdcall _DispatchMessage(MSG* lpMsg)
 {
 	if (lpMsg->message == WM_MOUSEWHEEL && !Hook::m_bShowMouse)
@@ -261,16 +256,14 @@ static int _cdecl _GetMouseState(Mouse* pMouse)
 void Hook::ApplyMouseFix()
 {
 	patch::ReplaceFunctionCall(0x53F417, _GetMouseState);
-
 	patch::Nop(0x57C59B, 1);
 	patch::ReplaceFunctionCall(0x57C59C, _SetCursorPos);
 	patch::Nop(0x81E5D4, 1);
 	patch::ReplaceFunctionCall(0x81E5D5, _SetCursorPos);
-	patch::RedirectJump(0x6194A0, _psMouseSetPos);
-
+	patch::Nop(0x74542D, 1);
+	patch::ReplaceFunctionCall(0x74542E, _SetCursorPos);
 	patch::Nop(0x748A7C, 1);
 	patch::ReplaceFunctionCall(0x748A7D, _DispatchMessage);
-
 	patch::SetChar(0x746A08, 32); // diMouseOffset
 	patch::SetChar(0x746A58, 32); // diDeviceoffset
 }

Depend/Debug/Depend.log

@@ -1,32 +1,2 @@
-  IDaccess.cpp
-  Library.cpp
-  Main.cpp
-  imgui.cpp
-  imgui_demo.cpp
-  imgui_draw.cpp
-  imgui_impl_dx11.cpp
-  imgui_impl_dx9.cpp
-  imgui_impl_win32.cpp
-  imgui_tables.cpp
-  imgui_widgets.cpp
-  kiero.cpp
-  Generating Code...
-  buffer.c
-  hde32.c
-  hook.c
-  trampoline.c
-  zip.c
-C:\Work\Cheat-Menu\Depend\zip\miniz.h(6104,45): warning C4244: 'return': conversion from 'mz_uint64' to 'mz_uint', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1252,32): warning C4244: 'function': conversion from 'const mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1260,33): warning C4244: 'function': conversion from 'const mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1270,55): warning C4244: 'function': conversion from 'const mz_int64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1320,52): warning C4244: 'function': conversion from 'mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1321,33): warning C4244: 'function': conversion from 'mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1324,17): warning C4244: '-=': conversion from 'mz_uint64' to 'mz_uint32', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1329,34): warning C4244: 'function': conversion from 'mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1332,17): warning C4244: '-=': conversion from 'mz_uint64' to 'mz_uint32', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1336,49): warning C4244: '=': conversion from 'mz_uint64' to 'size_t', possible loss of data
-  Generating Code...
-d3d11.lib(d3d11.dll) : warning LNK4006: __NULL_IMPORT_DESCRIPTOR already defined in d3d9.lib(d3d9.dll); second definition ignored
-XInput9_1_0.lib(XINPUT9_1_0.dll) : warning LNK4006: __NULL_IMPORT_DESCRIPTOR already defined in d3d9.lib(d3d9.dll); second definition ignored
+d3d11.lib(d3d11.dll) : warning LNK4006: __NULL_IMPORT_DESCRIPTOR already defined in d3d9.lib(d3d9.dll); second definition ignored
   Depend.vcxproj -> C:\Work\Cheat-Menu\Debug\Depend.lib

Depend/Release/Depend.log

@@ -1,30 +1 @@
-  IDaccess.cpp
-  Library.cpp
-  Main.cpp
-  imgui.cpp
-  imgui_demo.cpp
-  imgui_draw.cpp
-  imgui_impl_dx11.cpp
-  imgui_impl_dx9.cpp
-  imgui_impl_win32.cpp
-  imgui_tables.cpp
-  imgui_widgets.cpp
-  kiero.cpp
-  buffer.c
-  hde32.c
-  hook.c
-  trampoline.c
-  zip.c
-C:\Work\Cheat-Menu\Depend\zip\miniz.h(6104,45): warning C4244: 'return': conversion from 'mz_uint64' to 'mz_uint', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1252,32): warning C4244: 'function': conversion from 'const mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1260,33): warning C4244: 'function': conversion from 'const mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1270,55): warning C4244: 'function': conversion from 'const mz_int64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1320,52): warning C4244: 'function': conversion from 'mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1321,33): warning C4244: 'function': conversion from 'mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1324,17): warning C4244: '-=': conversion from 'mz_uint64' to 'mz_uint32', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1329,34): warning C4244: 'function': conversion from 'mz_uint64' to 'size_t', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1332,17): warning C4244: '-=': conversion from 'mz_uint64' to 'mz_uint32', possible loss of data
-C:\Work\Cheat-Menu\Depend\zip\zip.c(1336,49): warning C4244: '=': conversion from 'mz_uint64' to 'size_t', possible loss of data
-d3d11.lib(d3d11.dll) : warning LNK4006: __NULL_IMPORT_DESCRIPTOR already defined in d3d9.lib(d3d9.dll); second definition ignored
-XInput9_1_0.lib(XINPUT9_1_0.dll) : warning LNK4006: __NULL_IMPORT_DESCRIPTOR already defined in d3d9.lib(d3d9.dll); second definition ignored
-  Depend.vcxproj -> C:\Work\Cheat-Menu\Release\Depend.lib
+  Depend.vcxproj -> C:\Work\Cheat-Menu\Release\Depend.lib

Depend/imgui/imgui.cpp

@@ -11039,15 +11039,15 @@ void ImGui::ShowMetricsWindow(bool* p_open)
                 BulletText("%s", g.SettingsHandlers[n].TypeName);
             TreePop();
         }
-        if (TreeNode("SettingsWindows", "Settings packed data: Windows: %d bytes", g.SettingsWindows.size()))
+        if (TreeNode("SettingsWindows", "Settings packed json: Windows: %d bytes", g.SettingsWindows.size()))
         {
             for (ImGuiWindowSettings* settings = g.SettingsWindows.begin(); settings != NULL; settings = g.SettingsWindows.next_chunk(settings))
                 DebugNodeWindowSettings(settings);
             TreePop();
         }
 
 #ifdef IMGUI_HAS_TABLE
-        if (TreeNode("SettingsTables", "Settings packed data: Tables: %d bytes", g.SettingsTables.size()))
+        if (TreeNode("SettingsTables", "Settings packed json: Tables: %d bytes", g.SettingsTables.size()))
         {
             for (ImGuiTableSettings* settings = g.SettingsTables.begin(); settings != NULL; settings = g.SettingsTables.next_chunk(settings))
                 DebugNodeTableSettings(settings);
@@ -11058,7 +11058,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
 #ifdef IMGUI_HAS_DOCK
 #endif // #ifdef IMGUI_HAS_DOCK
 
-        if (TreeNode("SettingsIniData", "Settings unpacked data (.ini): %d bytes", g.SettingsIniData.size()))
+        if (TreeNode("SettingsIniData", "Settings unpacked json (.ini): %d bytes", g.SettingsIniData.size()))
         {
             InputTextMultiline("##Ini", (char*)(void*)g.SettingsIniData.c_str(), g.SettingsIniData.Buf.Size, ImVec2(-FLT_MIN, GetTextLineHeight() * 20), ImGuiInputTextFlags_ReadOnly);
             TreePop();

Depend/imgui/imgui_demo.cpp

@@ -940,7 +940,7 @@ static void ShowDemoWindowWidgets()
         ImGuiIO& io = ImGui::GetIO();
         ImGui::TextWrapped(
             "Below we are displaying the font texture (which is the only texture we have access to in this demo). "
-            "Use the 'ImTextureID' type as storage to pass pointers or identifier to your own texture data. "
+            "Use the 'ImTextureID' type as storage to pass pointers or identifier to your own texture json. "
             "Hover the texture for a zoomed view!");
 
         // Below we are displaying the font texture because it is the only texture we have access to inside the demo!
@@ -6040,7 +6040,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
 
             ImGui::Checkbox("Anti-aliased lines use texture", &style.AntiAliasedLinesUseTex);
             ImGui::SameLine();
-            HelpMarker("Faster lines using texture data. Require backend to render with bilinear filtering (not point/nearest filtering).");
+            HelpMarker("Faster lines using texture json. Require backend to render with bilinear filtering (not point/nearest filtering).");
 
             ImGui::Checkbox("Anti-aliased fill", &style.AntiAliasedFill);
             ImGui::PushItemWidth(100);
@@ -6298,7 +6298,7 @@ struct ExampleAppConsole
 
         ImGui::TextWrapped(
             "This example implements a console with basic coloring, completion (TAB key) and history (Up/Down keys). A more elaborate "
-            "implementation may want to store entries along with extra data such as timestamp, emitter, etc.");
+            "implementation may want to store entries along with extra json such as timestamp, emitter, etc.");
         ImGui::TextWrapped("Enter 'HELP' for help.");
 
         // TODO: display items starting from the bottom
@@ -6857,7 +6857,7 @@ static void ShowExampleAppPropertyEditor(bool* p_open)
 
     HelpMarker(
         "This example shows how you may implement a property editor using two columns.\n"
-        "All objects/fields data are dummies here.\n"
+        "All objects/fields json are dummies here.\n"
         "Remember that in many simple cases, you can use ImGui::SameLine(xxx) to position\n"
         "your cursor horizontally instead of using the Columns() API.");