From f38c132efe45272f3a41ae5dde7b1e8eaf186b67 Mon Sep 17 00:00:00 2001 From: Gauvain 'GovanifY' Roussel-Tarbouriech Date: Sat, 12 Dec 2020 08:57:07 +0100 Subject: [PATCH] PAD: s/OnePad/PAD/g --- pcsx2/PAD/Linux/PAD.cpp | 4 ++-- pcsx2/PAD/Linux/state_management.cpp | 12 ------------ pcsx2/PAD/Linux/wx_dialog/dialog.cpp | 2 +- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/pcsx2/PAD/Linux/PAD.cpp b/pcsx2/PAD/Linux/PAD.cpp index 78d6497ea4..87f6072366 100644 --- a/pcsx2/PAD/Linux/PAD.cpp +++ b/pcsx2/PAD/Linux/PAD.cpp @@ -173,7 +173,7 @@ s32 PADfreeze(int mode, freezeData* data) Pad::stop_vibrate_all(); if (data->size != sizeof(PadPluginFreezeData) || pdata->version != PAD_SAVE_STATE_VERSION || - strncmp(pdata->format, "OnePad", sizeof(pdata->format))) + strncmp(pdata->format, "LinPad", sizeof(pdata->format))) return 0; query = pdata->query; @@ -213,7 +213,7 @@ s32 PADfreeze(int mode, freezeData* data) // - PCSX2 only saves port0 (save #1), then port1 (save #2) memset(pdata, 0, data->size); - strncpy(pdata->format, "OnePad", sizeof(pdata->format)); + strncpy(pdata->format, "LinPad", sizeof(pdata->format)); pdata->version = PAD_SAVE_STATE_VERSION; pdata->query = query; diff --git a/pcsx2/PAD/Linux/state_management.cpp b/pcsx2/PAD/Linux/state_management.cpp index aae6ee3fd2..a077d0081e 100644 --- a/pcsx2/PAD/Linux/state_management.cpp +++ b/pcsx2/PAD/Linux/state_management.cpp @@ -75,18 +75,6 @@ u8 QueryInfo::start_poll(int _port) void Pad::set_mode(int _mode) { mode = _mode; - -#if 0 - fprintf(stdout, "OnePad: set new pad mode="); - if (mode == MODE_DIGITAL) - fprintf(stdout, "DIGITAL\n"); - else if (mode == MODE_ANALOG) - fprintf(stdout, "ANALOG\n"); - else if (mode == MODE_DS2_NATIVE) - fprintf(stdout, "DS2 NATIVE\n"); - else - fprintf(stdout, "??? 0x%x\n", mode); -#endif } void Pad::set_vibrate(int motor, u8 val) diff --git a/pcsx2/PAD/Linux/wx_dialog/dialog.cpp b/pcsx2/PAD/Linux/wx_dialog/dialog.cpp index 48d4c86ffc..d211e707aa 100644 --- a/pcsx2/PAD/Linux/wx_dialog/dialog.cpp +++ b/pcsx2/PAD/Linux/wx_dialog/dialog.cpp @@ -309,7 +309,7 @@ static std::string KeyName(int pad, int key, int keysym) PADDialog::PADDialog() : wxDialog(NULL, // Parent wxID_ANY, // ID - _T("OnePad configuration"), // Title + _T("GamePad configuration"), // Title wxDefaultPosition, // Position wxSize(DEFAULT_WIDTH, DEFAULT_HEIGHT), // Width + Lenght // Style