diff --git a/src/core/cheats/cheats.cpp b/src/core/cheats/cheats.cpp index f4b48fd06..37700bb2c 100644 --- a/src/core/cheats/cheats.cpp +++ b/src/core/cheats/cheats.cpp @@ -102,7 +102,7 @@ void CheatEngine::LoadCheatFile() { } } -void CheatEngine::RunCallback([[maybe_unused]] u64 userdata, int cycles_late) { +void CheatEngine::RunCallback([[maybe_unused]] u64 userdata, s64 cycles_late) { { std::shared_lock lock(cheats_list_mutex); for (auto& cheat : cheats_list) { diff --git a/src/core/cheats/cheats.h b/src/core/cheats/cheats.h index 1dfed7ab8..c45c1044f 100644 --- a/src/core/cheats/cheats.h +++ b/src/core/cheats/cheats.h @@ -35,7 +35,7 @@ public: private: void LoadCheatFile(); - void RunCallback(u64 userdata, int cycles_late); + void RunCallback(u64 userdata, s64 cycles_late); std::vector> cheats_list; mutable std::shared_mutex cheats_list_mutex; Core::TimingEventType* event; diff --git a/src/core/file_sys/patch.cpp b/src/core/file_sys/patch.cpp index c93767165..f4fb05ac2 100644 --- a/src/core/file_sys/patch.cpp +++ b/src/core/file_sys/patch.cpp @@ -15,8 +15,8 @@ namespace FileSys::Patch { bool ApplyIpsPatch(const std::vector& ips, std::vector& buffer) { - u32 cursor = 5; - u32 patch_length = ips.size() - 3; + std::size_t cursor = 5; + std::size_t patch_length = ips.size() - 3; std::string ips_header(ips.begin(), ips.begin() + 5); if (ips_header != "PATCH") { @@ -30,7 +30,7 @@ bool ApplyIpsPatch(const std::vector& ips, std::vector& buffer) { if (eof_check == "EOF") return false; - u32 offset = ips[cursor] << 16 | ips[cursor + 1] << 8 | ips[cursor + 2]; + std::size_t offset = ips[cursor] << 16 | ips[cursor + 1] << 8 | ips[cursor + 2]; std::size_t length = ips[cursor + 3] << 8 | ips[cursor + 4]; // check for an rle record