From f281da0ffa6780a7b016f476f7c5225cb7d7b2e2 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 24 Oct 2023 22:10:40 +0300 Subject: [PATCH] format --- include/cheats.hpp | 3 +-- src/core/cheats.cpp | 14 +++++++------- src/hydra_core.cpp | 12 +++++------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/include/cheats.hpp b/include/cheats.hpp index 1ffa83b71..59e88e7a2 100644 --- a/include/cheats.hpp +++ b/include/cheats.hpp @@ -12,9 +12,8 @@ class Memory; class Cheats { public: enum class CheatType { - None, + None, // Cheat has been removed by the frontend or is invalid ActionReplay, // CTRPF cheats - // TODO: Other cheat devices and standards? }; struct Cheat { diff --git a/src/core/cheats.cpp b/src/core/cheats.cpp index c359d432c..83e7cdc4e 100644 --- a/src/core/cheats.cpp +++ b/src/core/cheats.cpp @@ -25,8 +25,8 @@ u32 Cheats::addCheat(const Cheat& cheat) { void Cheats::removeCheat(u32 id) { if (id >= cheats.size()) { - return; - } + return; + } // Not using std::erase because we don't want to invalidate cheat IDs cheats[id].type = CheatType::None; @@ -42,14 +42,14 @@ void Cheats::removeCheat(u32 id) { void Cheats::enableCheat(u32 id) { if (id < cheats.size()) { - cheats[id].enabled = true; - } + cheats[id].enabled = true; + } } void Cheats::disableCheat(u32 id) { if (id < cheats.size()) { - cheats[id].enabled = false; - } + cheats[id].enabled = false; + } } void Cheats::clear() { @@ -67,7 +67,7 @@ void Cheats::run() { break; } - case CheatType::None: break; + case CheatType::None: break; default: Helpers::panic("Unknown cheat device!"); } } diff --git a/src/hydra_core.cpp b/src/hydra_core.cpp index 9cfd00356..f080581ab 100644 --- a/src/hydra_core.cpp +++ b/src/hydra_core.cpp @@ -133,20 +133,18 @@ void HydraCore::setCheckButtonCallback(s32 (*callback)(u32 player, hydra::Button u32 HydraCore::addCheat(const u8* data, u32 size) { // Every 3DS cheat is a multiple of 64 bits == 8 bytes - if ((size % 8) != 0) { - return hydra::BAD_CHEAT; - } + if ((size % 8) != 0) { + return hydra::BAD_CHEAT; + } Cheats::Cheat cheat; cheat.enabled = true; cheat.type = Cheats::CheatType::ActionReplay; for (u32 i = 0; i < size; i += 8) { - auto read32 = [](const u8* ptr) { - return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); - }; + auto read32 = [](const u8* ptr) { return (u32(ptr[3]) << 24) | (u32(ptr[2]) << 16) | (u32(ptr[1]) << 8) | u32(ptr[0]); }; - // Data is passed to us in big endian so we bswap + // Data is passed to us in big endian so we bswap u32 firstWord = Common::swap32(read32(data + i)); u32 secondWord = Common::swap32(read32(data + i + 4)); cheat.instructions.insert(cheat.instructions.end(), {firstWord, secondWord});