Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
wheremyfoodat authored and OFFTKP committed Oct 25, 2023
1 parent f2a53ab commit 3c71fe8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 16 deletions.
3 changes: 1 addition & 2 deletions include/cheats.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions src/core/cheats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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() {
Expand All @@ -67,7 +67,7 @@ void Cheats::run() {
break;
}

case CheatType::None: break;
case CheatType::None: break;
default: Helpers::panic("Unknown cheat device!");
}
}
Expand Down
12 changes: 5 additions & 7 deletions src/hydra_core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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});
Expand Down

0 comments on commit 3c71fe8

Please sign in to comment.