Skip to content

Commit 6590e08

Browse files
committed
Fix rectangle conch bug + netplaymessages ON by default
This reverts changes in this commit dolphin-emu@c95c43b
1 parent d25d912 commit 6590e08

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Data/user/Config/GFX.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[Settings]
2+
ShowNetPlayMessages = True

Source/Core/Core/HW/GCPadEmu.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,14 @@ GCPadStatus GCPad::GetInput() const
151151
m_dpad->GetState(&pad.button, dpad_bitmasks, m_input_override_function);
152152

153153
// sticks
154+
// P+ change: revert the coordinates back to un-normalized/symmetrical ranges to fix rectangle controllers
154155
const auto main_stick_state = m_main_stick->GetState(m_input_override_function);
155-
pad.stickX = MapFloat<u8>(main_stick_state.x, GCPadStatus::MAIN_STICK_CENTER_X, 1);
156-
pad.stickY = MapFloat<u8>(main_stick_state.y, GCPadStatus::MAIN_STICK_CENTER_Y, 1);
156+
pad.stickX = MapFloat<u8>(main_stick_state.x, GCPadStatus::MAIN_STICK_CENTER_X);
157+
pad.stickY = MapFloat<u8>(main_stick_state.y, GCPadStatus::MAIN_STICK_CENTER_Y);
157158

158159
const auto c_stick_state = m_c_stick->GetState(m_input_override_function);
159-
pad.substickX = MapFloat<u8>(c_stick_state.x, GCPadStatus::C_STICK_CENTER_X, 1);
160-
pad.substickY = MapFloat<u8>(c_stick_state.y, GCPadStatus::C_STICK_CENTER_Y, 1);
160+
pad.substickX = MapFloat<u8>(c_stick_state.x, GCPadStatus::C_STICK_CENTER_X);
161+
pad.substickY = MapFloat<u8>(c_stick_state.y, GCPadStatus::C_STICK_CENTER_Y);
161162

162163
// triggers
163164
std::array<ControlState, 2> triggers;

0 commit comments

Comments
 (0)