mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 04:06:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull in project-slippi/Ishiiruka/commit/8df16c43cfef689f1bcaca0da5526b334bfe3994

Browse source 
fix chat bug which could cause other EXI commands to run
This commit is contained in:
Nikhil Narayana 2021-12-17 21:36:05 -08:00
commit 1f9217f7df
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/Core/Core/HW/EXI/EXI_DeviceSlippi.cpp
View file

@ -2446,9 +2446,7 @@ std::vector<u8> CEXISlippi::loadPremadeText(u8* payload)
playerName = defaultNames[port]; playerName = defaultNames[port];
#endif #endif
u8 paramId = payload[1] == 0x83 ? u8 paramId = payload[1];
0x88 :
payload[1]; // TODO: Figure out what the hell is going on and fix this
if (paramId == SlippiPremadeText::CHAT_MSG_CHAT_DISABLED) if (paramId == SlippiPremadeText::CHAT_MSG_CHAT_DISABLED)
{ {

4
Source/Core/Core/HW/EXI/EXI_DeviceSlippi.h
View file

@ -132,8 +132,8 @@ private:
{CMD_GCT_LENGTH, 0x0}, {CMD_GCT_LENGTH, 0x0},
{CMD_GCT_LOAD, 0x4}, {CMD_GCT_LOAD, 0x4},
{CMD_GET_DELAY, 0x0}, {CMD_GET_DELAY, 0x0},
{CMD_PREMADE_TEXT_LENGTH, 0x0}, {CMD_PREMADE_TEXT_LENGTH, 0x2},
{CMD_PREMADE_TEXT_LOAD, 0x4}, {CMD_PREMADE_TEXT_LOAD, 0x2},
}; };
struct WriteMessage struct WriteMessage