CtrlReset cleanup,

Ctrl-F2 = CtrlReset
This commit is contained in:
mpohoreski 2009-02-17 02:13:18 +00:00
parent 6b5aea9a4f
commit 93fe0ea8bd

View File

@ -108,6 +108,7 @@ void SetUsingCursor (BOOL);
static bool FileExists(string strFilename); static bool FileExists(string strFilename);
bool g_bScrollLock_FullSpeed = false; bool g_bScrollLock_FullSpeed = false;
bool g_bFreshReset = false;
// Prototypes: // Prototypes:
static void DrawCrosshairs (int x, int y); static void DrawCrosshairs (int x, int y);
@ -1287,6 +1288,12 @@ void ProcessButtonClick (int button) {
break; break;
case BTN_RUN: case BTN_RUN:
if( g_bCtrlKey )
{
CtrlReset();
return;
}
if (g_nAppMode == MODE_LOGO) if (g_nAppMode == MODE_LOGO)
{ {
DiskBoot(); DiskBoot();
@ -1494,7 +1501,8 @@ void RelayEvent (UINT message, WPARAM wparam, LPARAM lparam) {
} }
//=========================================================================== //===========================================================================
void ResetMachineState () { void ResetMachineState ()
{
DiskReset(); // Set floppymotoron=0 DiskReset(); // Set floppymotoron=0
g_bFullSpeed = 0; // Might've hit reset in middle of InternalCpuExecute() - so beep may get (partially) muted g_bFullSpeed = 0; // Might've hit reset in middle of InternalCpuExecute() - so beep may get (partially) muted
@ -1514,6 +1522,25 @@ void ResetMachineState () {
SoundCore_SetFade(FADE_NONE); SoundCore_SetFade(FADE_NONE);
} }
//===========================================================================
void CtrlReset()
{
// Ctrl+Reset
if (!IS_APPLE2)
MemResetPaging();
DiskReset();
KeybReset();
if (!IS_APPLE2)
VideoResetState(); // Switch Alternate char set off
MB_Reset();
CpuReset();
g_bFreshReset = true;
}
//=========================================================================== //===========================================================================
void SetFullScreenMode () void SetFullScreenMode ()
{ {