diff --git a/CheatMenu/Game.cpp b/CheatMenu/Game.cpp index 184ee2c..d18e81c 100644 --- a/CheatMenu/Game.cpp +++ b/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); diff --git a/CheatMenu/Hook.cpp b/CheatMenu/Hook.cpp index 88fcddf..91b2701 100644 --- a/CheatMenu/Hook.cpp +++ b/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 } diff --git a/Depend/Debug/Depend.idb b/Depend/Debug/Depend.idb index ea6df1f..ba9a8a6 100644 Binary files a/Depend/Debug/Depend.idb and b/Depend/Debug/Depend.idb differ diff --git a/Depend/Debug/Depend.log b/Depend/Debug/Depend.log index e899f14..b96fef1 100644 --- a/Depend/Debug/Depend.log +++ b/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 diff --git a/Depend/Debug/Depend.pdb b/Depend/Debug/Depend.pdb index 643e5a0..c96cc56 100644 Binary files a/Depend/Debug/Depend.pdb and b/Depend/Debug/Depend.pdb differ diff --git a/Depend/Debug/Depend.tlog/CL.command.1.tlog b/Depend/Debug/Depend.tlog/CL.command.1.tlog index 27a8958..9fbdeab 100644 Binary files a/Depend/Debug/Depend.tlog/CL.command.1.tlog and b/Depend/Debug/Depend.tlog/CL.command.1.tlog differ diff --git a/Depend/Debug/Depend.tlog/CL.read.1.tlog b/Depend/Debug/Depend.tlog/CL.read.1.tlog index 09d0653..f13259b 100644 Binary files a/Depend/Debug/Depend.tlog/CL.read.1.tlog and b/Depend/Debug/Depend.tlog/CL.read.1.tlog differ diff --git a/Depend/Debug/Depend.tlog/CL.write.1.tlog b/Depend/Debug/Depend.tlog/CL.write.1.tlog index 3b130af..061aa15 100644 Binary files a/Depend/Debug/Depend.tlog/CL.write.1.tlog and b/Depend/Debug/Depend.tlog/CL.write.1.tlog differ diff --git a/Depend/Debug/Depend.tlog/Lib-link.read.1.tlog b/Depend/Debug/Depend.tlog/Lib-link.read.1.tlog index 61ecb11..aaafcab 100644 Binary files a/Depend/Debug/Depend.tlog/Lib-link.read.1.tlog and b/Depend/Debug/Depend.tlog/Lib-link.read.1.tlog differ diff --git a/Depend/Debug/Depend.tlog/Lib-link.write.1.tlog b/Depend/Debug/Depend.tlog/Lib-link.write.1.tlog index 01f9e82..8cfa516 100644 Binary files a/Depend/Debug/Depend.tlog/Lib-link.write.1.tlog and b/Depend/Debug/Depend.tlog/Lib-link.write.1.tlog differ diff --git a/Depend/Debug/Depend.tlog/Lib.command.1.tlog b/Depend/Debug/Depend.tlog/Lib.command.1.tlog index 0514585..480a398 100644 Binary files a/Depend/Debug/Depend.tlog/Lib.command.1.tlog and b/Depend/Debug/Depend.tlog/Lib.command.1.tlog differ diff --git a/Depend/Debug/IDaccess.obj b/Depend/Debug/IDaccess.obj index a371d43..4c52254 100644 Binary files a/Depend/Debug/IDaccess.obj and b/Depend/Debug/IDaccess.obj differ diff --git a/Depend/Debug/Library.obj b/Depend/Debug/Library.obj index d6376d6..de4d0ba 100644 Binary files a/Depend/Debug/Library.obj and b/Depend/Debug/Library.obj differ diff --git a/Depend/Debug/Main.obj b/Depend/Debug/Main.obj index 70d551c..15d4f0a 100644 Binary files a/Depend/Debug/Main.obj and b/Depend/Debug/Main.obj differ diff --git a/Depend/Debug/buffer.obj b/Depend/Debug/buffer.obj index 655fcb5..ad8d193 100644 Binary files a/Depend/Debug/buffer.obj and b/Depend/Debug/buffer.obj differ diff --git a/Depend/Debug/hde32.obj b/Depend/Debug/hde32.obj index bd40104..d09525b 100644 Binary files a/Depend/Debug/hde32.obj and b/Depend/Debug/hde32.obj differ diff --git a/Depend/Debug/hook.obj b/Depend/Debug/hook.obj index e404ba9..041967e 100644 Binary files a/Depend/Debug/hook.obj and b/Depend/Debug/hook.obj differ diff --git a/Depend/Debug/imgui.obj b/Depend/Debug/imgui.obj index 0e10a55..3c7b951 100644 Binary files a/Depend/Debug/imgui.obj and b/Depend/Debug/imgui.obj differ diff --git a/Depend/Debug/imgui_demo.obj b/Depend/Debug/imgui_demo.obj index c2e72dc..01581a0 100644 Binary files a/Depend/Debug/imgui_demo.obj and b/Depend/Debug/imgui_demo.obj differ diff --git a/Depend/Debug/imgui_draw.obj b/Depend/Debug/imgui_draw.obj index 3b8e73e..ce9a7cb 100644 Binary files a/Depend/Debug/imgui_draw.obj and b/Depend/Debug/imgui_draw.obj differ diff --git a/Depend/Debug/imgui_impl_dx11.obj b/Depend/Debug/imgui_impl_dx11.obj index 34f2706..261998a 100644 Binary files a/Depend/Debug/imgui_impl_dx11.obj and b/Depend/Debug/imgui_impl_dx11.obj differ diff --git a/Depend/Debug/imgui_impl_dx9.obj b/Depend/Debug/imgui_impl_dx9.obj index 3dd4019..bdb7364 100644 Binary files a/Depend/Debug/imgui_impl_dx9.obj and b/Depend/Debug/imgui_impl_dx9.obj differ diff --git a/Depend/Debug/imgui_impl_win32.obj b/Depend/Debug/imgui_impl_win32.obj index b561f58..87c8634 100644 Binary files a/Depend/Debug/imgui_impl_win32.obj and b/Depend/Debug/imgui_impl_win32.obj differ diff --git a/Depend/Debug/imgui_tables.obj b/Depend/Debug/imgui_tables.obj index 4d3cb17..fba767b 100644 Binary files a/Depend/Debug/imgui_tables.obj and b/Depend/Debug/imgui_tables.obj differ diff --git a/Depend/Debug/imgui_widgets.obj b/Depend/Debug/imgui_widgets.obj index 303f1d9..57975c4 100644 Binary files a/Depend/Debug/imgui_widgets.obj and b/Depend/Debug/imgui_widgets.obj differ diff --git a/Depend/Debug/kiero.obj b/Depend/Debug/kiero.obj index 8ce4646..af43bd5 100644 Binary files a/Depend/Debug/kiero.obj and b/Depend/Debug/kiero.obj differ diff --git a/Depend/Debug/trampoline.obj b/Depend/Debug/trampoline.obj index 17d8a3f..11fd14d 100644 Binary files a/Depend/Debug/trampoline.obj and b/Depend/Debug/trampoline.obj differ diff --git a/Depend/Debug/zip.obj b/Depend/Debug/zip.obj index 60f3f55..ac0e9d4 100644 Binary files a/Depend/Debug/zip.obj and b/Depend/Debug/zip.obj differ diff --git a/Depend/Release/Depend.log b/Depend/Release/Depend.log index 87863a2..c2a6b73 100644 --- a/Depend/Release/Depend.log +++ b/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 diff --git a/Depend/Release/Depend.pdb b/Depend/Release/Depend.pdb index 8731e88..46d9352 100644 Binary files a/Depend/Release/Depend.pdb and b/Depend/Release/Depend.pdb differ diff --git a/Depend/Release/Depend.tlog/CL.command.1.tlog b/Depend/Release/Depend.tlog/CL.command.1.tlog index 310a8dc..8eb68cd 100644 Binary files a/Depend/Release/Depend.tlog/CL.command.1.tlog and b/Depend/Release/Depend.tlog/CL.command.1.tlog differ diff --git a/Depend/Release/Depend.tlog/CL.read.1.tlog b/Depend/Release/Depend.tlog/CL.read.1.tlog index aa5a08c..7ff7d6d 100644 Binary files a/Depend/Release/Depend.tlog/CL.read.1.tlog and b/Depend/Release/Depend.tlog/CL.read.1.tlog differ diff --git a/Depend/Release/Depend.tlog/CL.write.1.tlog b/Depend/Release/Depend.tlog/CL.write.1.tlog index 8867658..10320af 100644 Binary files a/Depend/Release/Depend.tlog/CL.write.1.tlog and b/Depend/Release/Depend.tlog/CL.write.1.tlog differ diff --git a/Depend/Release/Depend.tlog/Lib-link.read.1.tlog b/Depend/Release/Depend.tlog/Lib-link.read.1.tlog index 86df882..9732086 100644 Binary files a/Depend/Release/Depend.tlog/Lib-link.read.1.tlog and b/Depend/Release/Depend.tlog/Lib-link.read.1.tlog differ diff --git a/Depend/Release/Depend.tlog/Lib-link.write.1.tlog b/Depend/Release/Depend.tlog/Lib-link.write.1.tlog index 2913401..2713baa 100644 Binary files a/Depend/Release/Depend.tlog/Lib-link.write.1.tlog and b/Depend/Release/Depend.tlog/Lib-link.write.1.tlog differ diff --git a/Depend/Release/Depend.tlog/Lib.command.1.tlog b/Depend/Release/Depend.tlog/Lib.command.1.tlog index f0f2792..1ef4527 100644 Binary files a/Depend/Release/Depend.tlog/Lib.command.1.tlog and b/Depend/Release/Depend.tlog/Lib.command.1.tlog differ diff --git a/Depend/Release/IDaccess.obj b/Depend/Release/IDaccess.obj index 55064e0..ae370e5 100644 Binary files a/Depend/Release/IDaccess.obj and b/Depend/Release/IDaccess.obj differ diff --git a/Depend/Release/Library.obj b/Depend/Release/Library.obj index 4c390aa..09f88b0 100644 Binary files a/Depend/Release/Library.obj and b/Depend/Release/Library.obj differ diff --git a/Depend/Release/Main.obj b/Depend/Release/Main.obj index 4aaa8d7..3712609 100644 Binary files a/Depend/Release/Main.obj and b/Depend/Release/Main.obj differ diff --git a/Depend/Release/buffer.obj b/Depend/Release/buffer.obj index e928d33..83d490e 100644 Binary files a/Depend/Release/buffer.obj and b/Depend/Release/buffer.obj differ diff --git a/Depend/Release/hde32.obj b/Depend/Release/hde32.obj index 0b8e964..90ab8a5 100644 Binary files a/Depend/Release/hde32.obj and b/Depend/Release/hde32.obj differ diff --git a/Depend/Release/hook.obj b/Depend/Release/hook.obj index 46a37f7..35100a3 100644 Binary files a/Depend/Release/hook.obj and b/Depend/Release/hook.obj differ diff --git a/Depend/Release/imgui.obj b/Depend/Release/imgui.obj index 261b441..67540c8 100644 Binary files a/Depend/Release/imgui.obj and b/Depend/Release/imgui.obj differ diff --git a/Depend/Release/imgui_demo.obj b/Depend/Release/imgui_demo.obj index 6c1c190..1d7730a 100644 Binary files a/Depend/Release/imgui_demo.obj and b/Depend/Release/imgui_demo.obj differ diff --git a/Depend/Release/imgui_draw.obj b/Depend/Release/imgui_draw.obj index e1ee177..92a8420 100644 Binary files a/Depend/Release/imgui_draw.obj and b/Depend/Release/imgui_draw.obj differ diff --git a/Depend/Release/imgui_impl_dx11.obj b/Depend/Release/imgui_impl_dx11.obj index 701313a..4b4b580 100644 Binary files a/Depend/Release/imgui_impl_dx11.obj and b/Depend/Release/imgui_impl_dx11.obj differ diff --git a/Depend/Release/imgui_impl_dx9.obj b/Depend/Release/imgui_impl_dx9.obj index 0950d78..dfcd2eb 100644 Binary files a/Depend/Release/imgui_impl_dx9.obj and b/Depend/Release/imgui_impl_dx9.obj differ diff --git a/Depend/Release/imgui_impl_win32.obj b/Depend/Release/imgui_impl_win32.obj index 9907197..6ee6245 100644 Binary files a/Depend/Release/imgui_impl_win32.obj and b/Depend/Release/imgui_impl_win32.obj differ diff --git a/Depend/Release/imgui_tables.obj b/Depend/Release/imgui_tables.obj index 1b1bce1..5e4868c 100644 Binary files a/Depend/Release/imgui_tables.obj and b/Depend/Release/imgui_tables.obj differ diff --git a/Depend/Release/imgui_widgets.obj b/Depend/Release/imgui_widgets.obj index 1e7ad11..f315b62 100644 Binary files a/Depend/Release/imgui_widgets.obj and b/Depend/Release/imgui_widgets.obj differ diff --git a/Depend/Release/kiero.obj b/Depend/Release/kiero.obj index a1d7238..7eefe0d 100644 Binary files a/Depend/Release/kiero.obj and b/Depend/Release/kiero.obj differ diff --git a/Depend/Release/trampoline.obj b/Depend/Release/trampoline.obj index be640c6..abc774e 100644 Binary files a/Depend/Release/trampoline.obj and b/Depend/Release/trampoline.obj differ diff --git a/Depend/Release/zip.obj b/Depend/Release/zip.obj deleted file mode 100644 index 00d1d53..0000000 Binary files a/Depend/Release/zip.obj and /dev/null differ diff --git a/Depend/imgui/imgui.cpp b/Depend/imgui/imgui.cpp index 94cd428..9604520 100644 --- a/Depend/imgui/imgui.cpp +++ b/Depend/imgui/imgui.cpp @@ -11039,7 +11039,7 @@ 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); @@ -11047,7 +11047,7 @@ void ImGui::ShowMetricsWindow(bool* p_open) } #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(); diff --git a/Depend/imgui/imgui_demo.cpp b/Depend/imgui/imgui_demo.cpp index 3af6f6a..dd1ab23 100644 --- a/Depend/imgui/imgui_demo.cpp +++ b/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.");