Apple-2-Tools
/
AppleWin
mirror of https://github.com/AppleWin/AppleWin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Renamed g_restart to g_bRestart.

This commit is contained in:
Kelvin Lee 2016-09-11 07:58:26 +10:00 committed by tomcw
parent e0cac15ede
commit 56570960ef
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/Applewin.cpp
View File

@ -78,7 +78,7 @@ TCHAR g_sProgramDir[MAX_PATH] = TEXT(""); // Directory of where AppleWin exe
TCHAR g_sDebugDir [MAX_PATH] = TEXT(""); // TODO: Not currently used
TCHAR g_sScreenShotDir[MAX_PATH] = TEXT(""); // TODO: Not currently used
TCHAR g_sCurrentDir[MAX_PATH] = TEXT(""); // Also Starting Dir. Debugger uses this when load/save
bool g_restart = false;
bool g_bRestart = false;
bool g_bRestartFullScreen = false;
DWORD g_dwSpeed = SPEED_NORMAL; // Affected by Config dialog's speed slider bar
@ -1091,7 +1091,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
do
{
// DO INITIALIZATION THAT MUST BE REPEATED FOR A RESTART
g_restart = false;
g_bRestart = false;
ResetToLogoMode();
LoadConfiguration();
@ -1202,7 +1202,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
EnterMessageLoop();
LogFileOutput("Main: LeaveMessageLoop()\n");
if (g_restart)
if (g_bRestart)
{
bSetFullScreen = g_bRestartFullScreen;
g_bRestartFullScreen = false;
@ -1214,7 +1214,7 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
sg_Mouse.Uninitialize(); // Maybe restarting due to switching slot-4 card from MouseCard to Mockingboard
LogFileOutput("Main: sg_Mouse.Uninitialize()\n");
}
while (g_restart);
while (g_bRestart);
// Release COM
DSUninit();

2
source/Applewin.h
View File

@ -33,7 +33,7 @@ void SetLoadedSaveStateFlag(const bool bFlag);
extern TCHAR g_sProgramDir[MAX_PATH];
extern TCHAR g_sCurrentDir[MAX_PATH];
extern bool g_restart;
extern bool g_bRestart;
extern bool g_bRestartFullScreen;
extern DWORD g_dwSpeed;

6
source/Frame.cpp
View File

@ -994,7 +994,7 @@ LRESULT CALLBACK FrameWndProc (
case WM_CLOSE:
LogFileOutput("WM_CLOSE\n");
if (g_bIsFullScreen && g_restart)
if (g_bIsFullScreen && g_bRestart)
g_bRestartFullScreen = true;
if (g_bIsFullScreen)
SetNormalMode();
@ -1092,7 +1092,7 @@ LRESULT CALLBACK FrameWndProc (
DragAcceptFiles(window,0);
Snapshot_Shutdown();
DebugDestroy();
if (!g_restart) {
if (!g_bRestart) {
DiskDestroy();
ImageDestroy();
HD_Destroy();
@ -1688,7 +1688,7 @@ LRESULT CALLBACK FrameWndProc (
// . Changed slot configuration
// . Changed disk speed (normal or enhanced)
// . Changed Freeze F8 rom setting
g_restart = true;
g_bRestart = true;
PostMessage(window,WM_CLOSE,0,0);
break;