piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 07:10:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cart refactor (#1073)

Browse Source 
complete cart-interface refactor, will make this code a lot easier to deal with
This commit is contained in:
Arisotura
2021-04-25 00:48:02 +02:00
committed by GitHub
parent ede6e832d8
commit 1846a71265
12 changed files with 2152 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/Util_ROM.cpp
View File

@ -561,7 +561,7 @@ int Reset()
if (ROMPath[ROMSlot_GBA][0] != '\0')
{
char ext[5] = {0}; int _len = strlen(ROMPath[ROMSlot_GBA]);
strncpy(ext, ROMPath[ROMSlot_NDS] + _len - 4, 4);
strncpy(ext, ROMPath[ROMSlot_GBA] + _len - 4, 4);
if(!strncmp(ext, ".gba", 4))
{

22
src/frontend/qt_sdl/main.cpp
View File

@ -382,7 +382,7 @@ void EmuThread::run()
if (Input::HotkeyPressed(HK_SwapScreens)) emit swapScreensToggle();
if (GBACart::CartInserted && GBACart::HasSolarSensor)
/*if (GBACart::CartInserted && GBACart::HasSolarSensor)
{
if (Input::HotkeyPressed(HK_SolarSensorDecrease))
{
@ -398,6 +398,26 @@ void EmuThread::run()
sprintf(msg, "Solar sensor level set to %d", GBACart_SolarSensor::LightLevel);
OSD::AddMessage(0, msg);
}
}*/
if (Input::HotkeyPressed(HK_SolarSensorDecrease))
{
int level = GBACart::SetInput(GBACart::Input_SolarSensorDown, true);
if (level != -1)
{
char msg[64];
sprintf(msg, "Solar sensor level: %d", level);
OSD::AddMessage(0, msg);
}
}
if (Input::HotkeyPressed(HK_SolarSensorIncrease))
{
int level = GBACart::SetInput(GBACart::Input_SolarSensorUp, true);
if (level != -1)
{
char msg[64];
sprintf(msg, "Solar sensor level: %d", level);
OSD::AddMessage(0, msg);
}
}
if (EmuRunning == 1)