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

re-add all old OSD messages

This commit is contained in:
Arisotura 2020-05-28 18:22:02 +02:00
parent 79d4183ccd
commit a2004785a4
2 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/Util_ROM.cpp
View File

@ -384,10 +384,6 @@ bool SaveState(const char* filename)
} }
} }
/*char msg[64];
if (slot > 0) sprintf(msg, "State saved to slot %d", slot);
else sprintf(msg, "State saved to file");
OSD::AddMessage(0, msg);*/
return true; return true;
} }
@ -407,8 +403,6 @@ void UndoStateLoad()
strncpy(SRAMPath[ROMSlot_NDS], PrevSRAMPath[ROMSlot_NDS], 1024); strncpy(SRAMPath[ROMSlot_NDS], PrevSRAMPath[ROMSlot_NDS], 1024);
NDS::RelocateSave(SRAMPath[ROMSlot_NDS], false); NDS::RelocateSave(SRAMPath[ROMSlot_NDS], false);
} }
//OSD::AddMessage(0, "State load undone");
} }
} }

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

@ -364,16 +364,16 @@ void EmuThread::run()
if (Input::HotkeyPressed(HK_SolarSensorDecrease)) if (Input::HotkeyPressed(HK_SolarSensorDecrease))
{ {
if (GBACart_SolarSensor::LightLevel > 0) GBACart_SolarSensor::LightLevel--; if (GBACart_SolarSensor::LightLevel > 0) GBACart_SolarSensor::LightLevel--;
//char msg[64]; char msg[64];
//sprintf(msg, "Solar sensor level set to %d", GBACart_SolarSensor::LightLevel); sprintf(msg, "Solar sensor level set to %d", GBACart_SolarSensor::LightLevel);
//OSD::AddMessage(0, msg); OSD::AddMessage(0, msg);
} }
if (Input::HotkeyPressed(HK_SolarSensorIncrease)) if (Input::HotkeyPressed(HK_SolarSensorIncrease))
{ {
if (GBACart_SolarSensor::LightLevel < 10) GBACart_SolarSensor::LightLevel++; if (GBACart_SolarSensor::LightLevel < 10) GBACart_SolarSensor::LightLevel++;
//char msg[64]; char msg[64];
//sprintf(msg, "Solar sensor level set to %d", GBACart_SolarSensor::LightLevel); sprintf(msg, "Solar sensor level set to %d", GBACart_SolarSensor::LightLevel);
//OSD::AddMessage(0, msg); OSD::AddMessage(0, msg);
} }
} }
@ -411,7 +411,7 @@ void EmuThread::run()
{ {
bool lid = !NDS::IsLidClosed(); bool lid = !NDS::IsLidClosed();
NDS::SetLidClosed(lid); NDS::SetLidClosed(lid);
//OSD::AddMessage(0, lid ? "Lid closed" : "Lid opened"); OSD::AddMessage(0, lid ? "Lid closed" : "Lid opened");
} }
// microphone input // microphone input
@ -1493,13 +1493,16 @@ void MainWindow::onSaveState()
if (Frontend::SaveState(filename)) if (Frontend::SaveState(filename))
{ {
// TODO: OSD message char msg[64];
if (slot > 0) sprintf(msg, "State saved to slot %d", slot);
else sprintf(msg, "State saved to file");
OSD::AddMessage(0, msg);
actLoadState[slot]->setEnabled(true); actLoadState[slot]->setEnabled(true);
} }
else else
{ {
// TODO: OSD error message? OSD::AddMessage(0xFFA0A0, "State save failed");
} }
emuThread->emuUnpause(); emuThread->emuUnpause();
@ -1534,10 +1537,10 @@ void MainWindow::onLoadState()
if (!Platform::FileExists(filename)) if (!Platform::FileExists(filename))
{ {
/*char msg[64]; char msg[64];
if (slot > 0) sprintf(msg, "State slot %d is empty", slot); if (slot > 0) sprintf(msg, "State slot %d is empty", slot);
else sprintf(msg, "State file does not exist"); else sprintf(msg, "State file does not exist");
OSD::AddMessage(0xFFA0A0, msg);*/ OSD::AddMessage(0xFFA0A0, msg);
emuThread->emuUnpause(); emuThread->emuUnpause();
return; return;
@ -1545,11 +1548,14 @@ void MainWindow::onLoadState()
if (Frontend::LoadState(filename)) if (Frontend::LoadState(filename))
{ {
// TODO: OSD message char msg[64];
if (slot > 0) sprintf(msg, "State loaded from slot %d", slot);
else sprintf(msg, "State loaded from file");
OSD::AddMessage(0, msg);
} }
else else
{ {
// TODO: OSD error message? OSD::AddMessage(0xFFA0A0, "State load failed");
} }
emuThread->emuUnpause(); emuThread->emuUnpause();
@ -1560,6 +1566,8 @@ void MainWindow::onUndoStateLoad()
emuThread->emuPause(); emuThread->emuPause();
Frontend::UndoStateLoad(); Frontend::UndoStateLoad();
emuThread->emuUnpause(); emuThread->emuUnpause();
OSD::AddMessage(0, "State load undone");
} }
void MainWindow::onQuit() void MainWindow::onQuit()
@ -1575,10 +1583,12 @@ void MainWindow::onPause(bool checked)
if (checked) if (checked)
{ {
emuThread->emuPause(); emuThread->emuPause();
OSD::AddMessage(0, "Paused");
} }
else else
{ {
emuThread->emuUnpause(); emuThread->emuUnpause();
OSD::AddMessage(0, "Resumed");
} }
} }
@ -1600,8 +1610,7 @@ void MainWindow::onReset()
} }
else else
{ {
// OSD::AddMessage(0, "Reset"); OSD::AddMessage(0, "Reset");
emuThread->emuRun(); emuThread->emuRun();
} }
} }
@ -1835,7 +1844,7 @@ void emuStop()
emit emuThread->windowEmuStop(); emit emuThread->windowEmuStop();
//OSD::AddMessage(0xFFC040, "Shutdown"); OSD::AddMessage(0xFFC040, "Shutdown");
} }