diff --git a/UE4SS/src/GUI/BPMods.cpp b/UE4SS/src/GUI/BPMods.cpp index 1f1e48f1b..df85dc139 100644 --- a/UE4SS/src/GUI/BPMods.cpp +++ b/UE4SS/src/GUI/BPMods.cpp @@ -113,7 +113,7 @@ namespace RC::GUI::BPMods const auto& mod_button = mod_info.ModButtons[i2]; if (ImGui::Button(std::format("{}", mod_button).c_str())) { - Output::send(SYSSTR("Mod button {} hit.\n"), to_system(mod_button)); + Output::send(SYSSTR("Mod button {} hit.\n"), mod_button); mod_info.ModActor->ModMenuButtonPressed(static_cast(i2)); } } diff --git a/UE4SS/src/GUI/LiveView.cpp b/UE4SS/src/GUI/LiveView.cpp index 41d6d17c3..11d0a388c 100644 --- a/UE4SS/src/GUI/LiveView.cpp +++ b/UE4SS/src/GUI/LiveView.cpp @@ -2844,7 +2844,7 @@ namespace RC::GUI } else { - Output::send(SYSSTR("Search for: {}\n"), search_buffer.empty() ? STR("") : to_wstring(search_buffer)); + Output::send(SYSSTR("Search for: {}\n"), search_buffer.empty() ? SYSSTR("") : search_buffer); s_name_to_search_by = search_buffer; m_object_iterator = &LiveView::guobjectarray_by_name_iterator; m_is_searching_by_name = true; diff --git a/UE4SS/src/LuaLibrary.cpp b/UE4SS/src/LuaLibrary.cpp index 4b19cc9ef..a510b0111 100644 --- a/UE4SS/src/LuaLibrary.cpp +++ b/UE4SS/src/LuaLibrary.cpp @@ -107,7 +107,7 @@ namespace RC::LuaLibrary // Logging will only happen to the debug console but it's something at least if (!Output::has_internal_error()) { - Output::send(SYSSTR("Error: {}\n"), to_system(e)); + Output::send(SYSSTR("Error: {}\n"), e); } else { diff --git a/UE4SS/src/Mod/LuaMod.cpp b/UE4SS/src/Mod/LuaMod.cpp index 6fe566844..6cfc3a53e 100644 --- a/UE4SS/src/Mod/LuaMod.cpp +++ b/UE4SS/src/Mod/LuaMod.cpp @@ -1151,7 +1151,7 @@ No overload found for function 'RegisterKeyBindAsync'. } catch (std::runtime_error& e) { - Output::send(SYSSTR("{}\n"), to_system(lua.handle_error(e.what()))); + Output::send(SYSSTR("{}\n"), lua.handle_error(e.what())); } }; @@ -1270,7 +1270,7 @@ No overload found for function 'RegisterKeyBind'. } catch (std::runtime_error& e) { - Output::send(SYSSTR("{}\n"), to_system(lua.handle_error(e.what()))); + Output::send(SYSSTR("{}\n"), lua.handle_error(e.what())); } }; @@ -3801,7 +3801,7 @@ No overload found for function 'FPackageName:IsValidLongPackageName'. } catch (std::runtime_error& e) { - Output::send(SYSSTR("{}\n"), to_system(e.what())); + Output::send(SYSSTR("{}\n"), e.what()); } } } diff --git a/UE4SS/src/SDKGenerator/TMapOverrideGen.cpp b/UE4SS/src/SDKGenerator/TMapOverrideGen.cpp index 68aca9a65..25012e71e 100644 --- a/UE4SS/src/SDKGenerator/TMapOverrideGen.cpp +++ b/UE4SS/src/SDKGenerator/TMapOverrideGen.cpp @@ -67,7 +67,7 @@ namespace RC::UEGenerator { continue; } - Output::send(SYSSTR("Found Relevant TMap Property: {} in Class: {}\n"), property_name, to_system(object->GetName())); + Output::send(SYSSTR("Found Relevant TMap Property: {} in Class: {}\n"), property_name, object->GetName()); auto& fm_json_object = fm_object.new_object(property_name); auto& uaapi_array = uaapi_object.new_array(property_name); diff --git a/UE4SS/src/UE4SSProgram.cpp b/UE4SS/src/UE4SSProgram.cpp index f47871b03..e6e1f2495 100644 --- a/UE4SS/src/UE4SSProgram.cpp +++ b/UE4SS/src/UE4SSProgram.cpp @@ -98,7 +98,7 @@ namespace RC #define OUTPUT_MEMBER_OFFSETS_FOR_STRUCT(StructName) \ for (const auto& [name, offset] : Unreal::StructName::MemberOffsets) \ { \ - Output::send(SYSSTR(#StructName "::{} = 0x{:X}\n"), to_system(name), offset); \ + Output::send(SYSSTR(#StructName "::{} = 0x{:X}\n"), name, offset); \ } auto output_all_member_offsets() -> void diff --git a/UVTD/src/main.cpp b/UVTD/src/main.cpp index 3d7cf8ebf..f5d65895a 100644 --- a/UVTD/src/main.cpp +++ b/UVTD/src/main.cpp @@ -89,7 +89,7 @@ auto thread_dll_start([[maybe_unused]] LPVOID thread_param) -> unsigned long } catch (std::exception& e) { - Output::send(SYSSTR("Exception caught: {}\n"), to_wstring(e.what())); + Output::send(SYSSTR("Exception caught: {}\n"), e.what()); } return 0; diff --git a/deps/first/Unreal b/deps/first/Unreal index 3d8bd0d11..c38209263 160000 --- a/deps/first/Unreal +++ b/deps/first/Unreal @@ -1 +1 @@ -Subproject commit 3d8bd0d11833d2ea7baf5c52ccfb965af6796253 +Subproject commit c38209263c507810d7675d374772c06fdfb66f48