Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 06:05:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove global definition of badCheatHandle

Browse source
This commit is contained in:
wheremyfoodat 2024-01-27 20:38:17 +02:00
parent 31eea40ea5
commit 01b6380242
4 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cheats.hpp
View file

@ -9,8 +9,6 @@
// Forward-declare this since it's just passed and we don't want to include memory.hpp and increase compile time // Forward-declare this since it's just passed and we don't want to include memory.hpp and increase compile time
class Memory; class Memory;
constexpr u32 badCheatHandle = 0xFFFFFFFF;
class Cheats { class Cheats {
public: public:
enum class CheatType { enum class CheatType {
@ -35,6 +33,7 @@ class Cheats {
void clear(); void clear();
bool haveCheats() const { return cheatsLoaded; } bool haveCheats() const { return cheatsLoaded; }
static constexpr u32 badCheatHandle = 0xFFFFFFFF;
private: private:
ActionReplay ar; // An ActionReplay cheat machine for executing CTRPF codes ActionReplay ar; // An ActionReplay cheat machine for executing CTRPF codes

3
include/panda_qt/main_window.hpp
View file

@ -18,8 +18,7 @@
#include "panda_qt/text_editor.hpp" #include "panda_qt/text_editor.hpp"
#include "services/hid.hpp" #include "services/hid.hpp"
struct CheatMessage struct CheatMessage {
{
u32 handle; u32 handle;
std::vector<uint8_t> cheat; std::vector<uint8_t> cheat;
std::function<void(u32)> callback; std::function<void(u32)> callback;

33
src/panda_qt/cheats_window.cpp
View file

@ -19,14 +19,13 @@
MainWindow* mainWindow = nullptr; MainWindow* mainWindow = nullptr;
struct CheatMetadata { struct CheatMetadata {
u32 handle = badCheatHandle; u32 handle = Cheats::badCheatHandle;
std::string name = "New cheat"; std::string name = "New cheat";
std::string code; std::string code;
bool enabled = true; bool enabled = true;
}; };
void dispatchToMainThread(std::function<void()> callback) void dispatchToMainThread(std::function<void()> callback) {
{
QTimer* timer = new QTimer(); QTimer* timer = new QTimer();
timer->moveToThread(qApp->thread()); timer->moveToThread(qApp->thread());
timer->setSingleShot(true); timer->setSingleShot(true);
@ -110,7 +109,7 @@ CheatEntryWidget::CheatEntryWidget(Emulator* emu, CheatMetadata metadata, QListW
void CheatEntryWidget::checkboxChanged(int state) { void CheatEntryWidget::checkboxChanged(int state) {
bool enabled = state == Qt::Checked; bool enabled = state == Qt::Checked;
if (metadata.handle == badCheatHandle) { if (metadata.handle == Cheats::badCheatHandle) {
printf("Cheat handle is bad, this shouldn't happen\n"); printf("Cheat handle is bad, this shouldn't happen\n");
return; return;
} }
@ -196,22 +195,22 @@ void CheatEditDialog::accepted() {
} }
mainWindow->editCheat(cheatEntry.getMetadata().handle, bytes, [this](u32 handle) { mainWindow->editCheat(cheatEntry.getMetadata().handle, bytes, [this](u32 handle) {
dispatchToMainThread([this, handle]() { dispatchToMainThread([this, handle]() {
if (handle == badCheatHandle) { if (handle == Cheats::badCheatHandle) {
cheatEntry.Remove(); cheatEntry.Remove();
return; return;
} else { } else {
CheatMetadata metadata = cheatEntry.getMetadata(); CheatMetadata metadata = cheatEntry.getMetadata();
metadata.handle = handle; metadata.handle = handle;
cheatEntry.setMetadata(metadata); cheatEntry.setMetadata(metadata);
cheatEntry.Update(); cheatEntry.Update();
} }
}); });
}); });
} }
void CheatEditDialog::rejected() { void CheatEditDialog::rejected() {
bool isEditing = cheatEntry.getMetadata().handle != badCheatHandle; bool isEditing = cheatEntry.getMetadata().handle != Cheats::badCheatHandle;
if (!isEditing) { if (!isEditing) {
// Was adding a cheat but user pressed cancel // Was adding a cheat but user pressed cancel
cheatEntry.Remove(); cheatEntry.Remove();
@ -253,7 +252,7 @@ CheatsWindow::CheatsWindow(Emulator* emu, const std::filesystem::path& cheatPath
void CheatsWindow::addEntry() { void CheatsWindow::addEntry() {
// CheatEntryWidget is added to the list when it's created // CheatEntryWidget is added to the list when it's created
CheatEntryWidget* entry = new CheatEntryWidget(emu, {badCheatHandle, "New cheat", "", true}, cheatList); CheatEntryWidget* entry = new CheatEntryWidget(emu, {Cheats::badCheatHandle, "New cheat", "", true}, cheatList);
CheatEditDialog* dialog = new CheatEditDialog(emu, *entry); CheatEditDialog* dialog = new CheatEditDialog(emu, *entry);
dialog->show(); dialog->show();
} }

3
src/panda_qt/main_window.cpp
View file

@ -239,7 +239,6 @@ void MainWindow::showAboutMenu() {
} }
void MainWindow::openLuaEditor() { luaEditor->show(); } void MainWindow::openLuaEditor() { luaEditor->show(); }
void MainWindow::openCheatsEditor() { cheatsEditor->show(); } void MainWindow::openCheatsEditor() { cheatsEditor->show(); }
void MainWindow::dispatchMessage(const EmulatorMessage& message) { void MainWindow::dispatchMessage(const EmulatorMessage& message) {
@ -259,7 +258,7 @@ void MainWindow::dispatchMessage(const EmulatorMessage& message) {
u32 handle = message.cheat.c->handle; u32 handle = message.cheat.c->handle;
const std::vector<uint8_t>& cheat = message.cheat.c->cheat; const std::vector<uint8_t>& cheat = message.cheat.c->cheat;
const std::function<void(u32)>& callback = message.cheat.c->callback; const std::function<void(u32)>& callback = message.cheat.c->callback;
bool isEditing = handle != badCheatHandle; bool isEditing = handle != Cheats::badCheatHandle;
if (isEditing) { if (isEditing) {
emu->getCheats().removeCheat(handle); emu->getCheats().removeCheat(handle);
u32 handle = emu->getCheats().addCheat(cheat.data(), cheat.size()); u32 handle = emu->getCheats().addCheat(cheat.data(), cheat.size());