diff options
Diffstat (limited to 'games/openmw/files')
7 files changed, 97 insertions, 33 deletions
diff --git a/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp b/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp deleted file mode 100644 index fe61c1fc661e..000000000000 --- a/games/openmw/files/patch-apps_openmw_mwstate_charactermanager.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- apps/openmw/mwstate/charactermanager.hpp.orig 2023-08-08 09:23:20 UTC -+++ apps/openmw/mwstate/charactermanager.hpp -@@ -1,6 +1,8 @@ - #ifndef GAME_STATE_CHARACTERMANAGER_H - #define GAME_STATE_CHARACTERMANAGER_H - -+#include <list> -+ - #include <boost/filesystem/path.hpp> - - #include "character.hpp" diff --git a/games/openmw/files/patch-components_bsa_bsa__file.cpp b/games/openmw/files/patch-components_bsa_bsa__file.cpp deleted file mode 100644 index 0dcb26d6581f..000000000000 --- a/games/openmw/files/patch-components_bsa_bsa__file.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- components/bsa/bsa_file.cpp.orig 2023-08-08 09:23:20 UTC -+++ components/bsa/bsa_file.cpp -@@ -26,6 +26,7 @@ - #include <components/files/constrainedfilestream.hpp> - - #include <cassert> -+#include <algorithm> - - #include <boost/filesystem/path.hpp> - #include <boost/filesystem/fstream.hpp> diff --git a/games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp b/games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp new file mode 100644 index 000000000000..9a6941316d2b --- /dev/null +++ b/games/openmw/files/patch-components_crashcatcher_crashcatcher.cpp @@ -0,0 +1,42 @@ +--- components/crashcatcher/crashcatcher.cpp.orig 2025-07-01 11:41:15 UTC ++++ components/crashcatcher/crashcatcher.cpp +@@ -83,6 +83,7 @@ namespace + { SIGFPE, "FPU exception", "SIGFPE" }, + { SIGBUS, "System BUS error", "SIGBUS" }, + { SIGABRT, "Abnormal termination condition", "SIGABRT" }, ++ { 0, nullptr }, + }; + + constexpr SignalInfo sigIllCodes[] = { +@@ -96,6 +97,7 @@ namespace + { ILL_COPROC, "Coprocessor error" }, + { ILL_BADSTK, "Internal stack error" }, + #endif ++ { 0, nullptr }, + }; + + constexpr SignalInfo sigFpeCodes[] = { +@@ -107,6 +109,7 @@ namespace + { FPE_FLTRES, "Floating point inexact result" }, + { FPE_FLTINV, "Floating point invalid operation" }, + { FPE_FLTSUB, "Subscript out of range" }, ++ { 0, nullptr }, + }; + + constexpr SignalInfo sigSegvCodes[] = { +@@ -114,6 +117,7 @@ namespace + { SEGV_MAPERR, "Address not mapped to object" }, + { SEGV_ACCERR, "Invalid permissions for mapped object" }, + #endif ++ { 0, nullptr }, + }; + + constexpr SignalInfo sigBusCodes[] = { +@@ -122,6 +126,7 @@ namespace + { BUS_ADRERR, "Non-existent physical address" }, + { BUS_OBJERR, "Object specific hardware error" }, + #endif ++ { 0, nullptr }, + }; + + const char* findSignalDescription(std::span<const SignalInfo> info, int code) diff --git a/games/openmw/files/patch-components_esm3_variant.hpp b/games/openmw/files/patch-components_esm3_variant.hpp new file mode 100644 index 000000000000..e861f8a3c7ef --- /dev/null +++ b/games/openmw/files/patch-components_esm3_variant.hpp @@ -0,0 +1,10 @@ +--- components/esm3/variant.hpp.orig 2025-07-01 11:41:15 UTC ++++ components/esm3/variant.hpp +@@ -5,6 +5,7 @@ + #include <string> + #include <tuple> + #include <variant> ++#include <cstdint> + + namespace ESM + { diff --git a/games/openmw/files/patch-components_esm_formid.hpp b/games/openmw/files/patch-components_esm_formid.hpp new file mode 100644 index 000000000000..44f943fea077 --- /dev/null +++ b/games/openmw/files/patch-components_esm_formid.hpp @@ -0,0 +1,17 @@ +--- components/esm/formid.hpp.orig 2025-07-01 11:41:15 UTC ++++ components/esm/formid.hpp +@@ -51,10 +51,10 @@ namespace std + { + size_t operator()(const ESM::FormId& formId) const + { +- static_assert(sizeof(ESM::FormId) == sizeof(size_t)); +- size_t s; +- memcpy(&s, &formId, sizeof(size_t)); +- return hash<size_t>()(s); ++ static_assert(sizeof(ESM::FormId) == sizeof(uint64_t)); ++ uint64_t s; ++ memcpy(&s, &formId, sizeof(ESM::FormId)); ++ return hash<uint64_t>()(s); + } + }; + diff --git a/games/openmw/files/patch-components_misc_strings_algorithm.hpp b/games/openmw/files/patch-components_misc_strings_algorithm.hpp new file mode 100644 index 000000000000..c7aa3b1ecfeb --- /dev/null +++ b/games/openmw/files/patch-components_misc_strings_algorithm.hpp @@ -0,0 +1,28 @@ +--- components/misc/strings/algorithm.hpp.orig 2025-07-01 11:41:15 UTC ++++ components/misc/strings/algorithm.hpp +@@ -4,6 +4,7 @@ + #include "lower.hpp" + + #include <algorithm> ++#include <cstdint> + #include <functional> + #include <string> + #include <string_view> +@@ -88,14 +89,14 @@ namespace Misc::StringUtils + constexpr std::size_t operator()(std::string_view str) const + { + // FNV-1a +- std::size_t hash{ 0xcbf29ce484222325ull }; +- constexpr std::size_t prime{ 0x00000100000001B3ull }; ++ std::uint64_t hash{ 0xcbf29ce484222325ull }; ++ constexpr std::uint64_t prime{ 0x00000100000001B3ull }; + for (char c : str) + { +- hash ^= static_cast<std::size_t>(toLower(c)); ++ hash ^= static_cast<std::uint64_t>(toLower(c)); + hash *= prime; + } +- return hash; ++ return static_cast<std::size_t>(hash); + } + }; diff --git a/games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp b/games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp deleted file mode 100644 index ac31cf924f51..000000000000 --- a/games/openmw/files/patch-extern_sol3_sol_optional__implementation.hpp +++ /dev/null @@ -1,12 +0,0 @@ ---- extern/sol3/sol/optional_implementation.hpp.orig 2023-08-08 09:23:20 UTC -+++ extern/sol3/sol/optional_implementation.hpp -@@ -2191,7 +2191,8 @@ namespace sol { - static_assert(std::is_constructible<T, Args&&...>::value, "T must be constructible with Args"); - - *this = nullopt; -- this->construct(std::forward<Args>(args)...); -+ new (static_cast<void*>(this)) optional(std::in_place, std::forward<Args>(args)...); -+ return **this; - } - - /// Swaps this optional with the other. |