mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-12-06 07:12:28 +01:00
sys_usbd: fix id/type combo for Kamen Rider Display (#17662)
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, .ci/build-mac.sh, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run
Some checks are pending
Generate Translation Template / Generate Translation Template (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux-aarch64.sh, gcc, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (/rpcs3/.ci/build-linux.sh, gcc, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (a1d35836e8d45bfc6f63c26f0a3e5d46ef622fe1, rpcs3/rpcs3-binaries-linux-arm64, /rpcs3/.ci/build-linux-aarch64.sh, clang, rpcs3/rpcs3-ci-jammy-aarch64:1.7, ubuntu-24.04-arm) (push) Waiting to run
Build RPCS3 / RPCS3 Linux ${{ matrix.os }} ${{ matrix.compiler }} (d812f1254a1157c80fd402f94446310560f54e5f, rpcs3/rpcs3-binaries-linux, /rpcs3/.ci/build-linux.sh, clang, rpcs3/rpcs3-ci-jammy:1.7, ubuntu-24.04) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (51ae32f468089a8169aaf1567de355ff4a3e0842, rpcs3/rpcs3-binaries-mac, .ci/build-mac.sh, Intel) (push) Waiting to run
Build RPCS3 / RPCS3 Mac ${{ matrix.name }} (8e21bdbc40711a3fccd18fbf17b742348b0f4281, rpcs3/rpcs3-binaries-mac-arm64, .ci/build-mac-arm64.sh, Apple Silicon) (push) Waiting to run
Build RPCS3 / RPCS3 Windows (push) Waiting to run
Build RPCS3 / RPCS3 Windows Clang (win64, clang, clang64) (push) Waiting to run
Build RPCS3 / RPCS3 FreeBSD (push) Waiting to run
Fixes the display issues seen here: https://github.com/RPCS3/rpcs3/issues/17653
This commit is contained in:
parent
8712414123
commit
0403231a0d
|
|
@ -258,7 +258,7 @@ QString kamen_rider_creator_dialog::get_file_path() const
|
||||||
kamen_rider_dialog::kamen_rider_dialog(QWidget* parent)
|
kamen_rider_dialog::kamen_rider_dialog(QWidget* parent)
|
||||||
: QDialog(parent)
|
: QDialog(parent)
|
||||||
{
|
{
|
||||||
setWindowTitle(tr("kamen_riders Manager"));
|
setWindowTitle(tr("Kamen Rider Manager"));
|
||||||
setObjectName("kamen_riders_manager");
|
setObjectName("kamen_riders_manager");
|
||||||
setAttribute(Qt::WA_DeleteOnClose);
|
setAttribute(Qt::WA_DeleteOnClose);
|
||||||
setMinimumSize(QSize(700, 200));
|
setMinimumSize(QSize(700, 200));
|
||||||
|
|
@ -273,7 +273,7 @@ kamen_rider_dialog::kamen_rider_dialog(QWidget* parent)
|
||||||
vbox->addWidget(line);
|
vbox->addWidget(line);
|
||||||
};
|
};
|
||||||
|
|
||||||
QGroupBox* group_kamen_riders = new QGroupBox(tr("Active Portal Kamen Riders:"));
|
QGroupBox* group_kamen_riders = new QGroupBox(tr("Active Kamen Riders:"));
|
||||||
QVBoxLayout* vbox_group = new QVBoxLayout();
|
QVBoxLayout* vbox_group = new QVBoxLayout();
|
||||||
|
|
||||||
for (auto i = 0; i < UI_FIG_NUM; i++)
|
for (auto i = 0; i < UI_FIG_NUM; i++)
|
||||||
|
|
@ -385,8 +385,8 @@ void kamen_rider_dialog::load_kamen_rider_path(u8 slot, const QString& path)
|
||||||
|
|
||||||
clear_kamen_rider(slot);
|
clear_kamen_rider(slot);
|
||||||
|
|
||||||
u8 fig_id = data[0x19];
|
u8 fig_id = data[0x1B];
|
||||||
u8 fig_type = data[0x1B];
|
u8 fig_type = data[0x19];
|
||||||
|
|
||||||
u8 portal_slot = g_ridergate.load_figure(data, std::move(fig_file));
|
u8 portal_slot = g_ridergate.load_figure(data, std::move(fig_file));
|
||||||
figure_slots[slot] = std::tuple(portal_slot, fig_id, fig_type);
|
figure_slots[slot] = std::tuple(portal_slot, fig_id, fig_type);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue