ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge e9effd99a5 into 11efdb1651

This commit is contained in:
LuigiBlood 2025-07-15 01:50:10 +02:00 committed by GitHub
parent 11efdb1651 e9effd99a5
commit a0f5524eba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Source/Project64-core/N64System/Mips/PifRam.cpp
View File

@ -453,18 +453,28 @@ void CPifRam::ProcessControllerCommand(int32_t Control, uint8_t * Command)
g_Notify->DisplayError("What am I meant to do with this controller command?"); g_Notify->DisplayError("What am I meant to do with this controller command?");
} }
} }
if (Controllers[Control].Present != 0) if (Controllers[Control].Present != PRESENT_NONE)
{ {
Command[3] = 0x05; if (Controllers[Control].Present != PRESENT_MOUSE)
Command[4] = 0x00;
switch (Controllers[Control].Plugin)
{ {
case PLUGIN_TRANSFER_PAK: Command[3] = 0x05;
case PLUGIN_RUMBLE_PAK: Command[4] = 0x00;
case PLUGIN_MEMPAK: switch (Controllers[Control].Plugin)
case PLUGIN_RAW: {
Command[5] = 1; break; case PLUGIN_TRANSFER_PAK:
default: Command[5] = 0; break; case PLUGIN_RUMBLE_PAK:
case PLUGIN_MEMPAK:
case PLUGIN_RAW:
Command[5] = 1; break;
default: Command[5] = 0; break;
}
}
else //if (Controllers[Control].Present == PRESENT_MOUSE)
{
//N64 Mouse
Command[3] = 0x02;
Command[4] = 0x00;
Command[5] = 0x00;
} }
} }
else else