From 2fc141b1b62ab4e00241c88f7db6fa8e7441b075 Mon Sep 17 00:00:00 2001
From: mpohoreski <mpohoreski@b5e51362-a710-0410-a134-be2176fc2e42>
Date: Sun, 25 Jun 2006 03:46:33 +0000
Subject: [PATCH] Renamed globals to match coding convention: g_bApple2e
 g_bApple2plus g_sProgramDir

---
 AppleWin/source/Disk.cpp  |  6 +++---
 AppleWin/source/Frame.cpp | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/AppleWin/source/Disk.cpp b/AppleWin/source/Disk.cpp
index aca80504..d0304496 100644
--- a/AppleWin/source/Disk.cpp
+++ b/AppleWin/source/Disk.cpp
@@ -349,7 +349,7 @@ void DiskInitialize () {
   while (loop--)
     ZeroMemory(&g_aFloppyDisk[loop],sizeof(Disk_t ));
   TCHAR imagefilename[MAX_PATH];
-  _tcscpy(imagefilename,progdir);
+  _tcscpy(imagefilename,g_sProgramDir);
   _tcscat(imagefilename,TEXT("MASTER.DSK")); // TODO: Should remember last disk by user
   DiskInsert(0,imagefilename,0,0);
 }
@@ -469,7 +469,7 @@ void DiskSelectImage (int drive, LPSTR pszFilename)
 
   strcpy(filename, pszFilename);
 
-  RegLoadString(TEXT("Preferences"),TEXT("Starting Directory"),1,directory,MAX_PATH);
+  RegLoadString(TEXT("Preferences"),REGVALUE_PREF_START_DIR,1,directory,MAX_PATH);
   _tcscpy(title,TEXT("Select Disk Image For Drive "));
   _tcscat(title,drive ? TEXT("2") : TEXT("1"));
 
@@ -497,7 +497,7 @@ void DiskSelectImage (int drive, LPSTR pszFilename)
 	{
       filename[ofn.nFileOffset] = 0;
       if (_tcsicmp(directory,filename))
-        RegSaveString(TEXT("Preferences"),TEXT("Starting Directory"),1,filename);
+        RegSaveString(TEXT("Preferences"),REGVALUE_PREF_START_DIR,1,filename);
     }
     else
 	{
diff --git a/AppleWin/source/Frame.cpp b/AppleWin/source/Frame.cpp
index 486215d0..b18fe9cf 100644
--- a/AppleWin/source/Frame.cpp
+++ b/AppleWin/source/Frame.cpp
@@ -347,7 +347,7 @@ void DrawStatusArea (HDC passdc, int drawflags) {
     TextOut(dc,x+ 3,y+2,TEXT("1"),1);
     SetTextColor(dc,RGB((iDrive2Status==2 ? 255 : 0),(iDrive2Status==1 ? 255 : 0),0));
     TextOut(dc,x+13,y+2,TEXT("2"),1);
-    if (apple2e) {
+    if (g_bApple2e) {
       SetTextAlign(dc,TA_RIGHT | TA_TOP);
       SetTextColor(dc,(caps ? RGB(128,128,128) :
                               RGB(  0,  0,  0)));
@@ -377,14 +377,14 @@ void DrawStatusArea (HDC passdc, int drawflags) {
       RECT rect = {0,0,8,8};
       DrawBitmapRect(dc,x+12,y+8,&rect,diskbitmap[iDrive1Status]);
       DrawBitmapRect(dc,x+30,y+8,&rect,diskbitmap[iDrive2Status]);
-      if (apple2e) {
+      if (g_bApple2e) {
         RECT rect = {0,0,30,8};
         DrawBitmapRect(dc,x+7,y+19,&rect,capsbitmap[caps != 0]);
       }
     }
     if (drawflags & DRAW_TITLE) {
       TCHAR title[40];
-      _tcscpy(title,apple2e ? TITLE : (apple2plus ? TEXT("Apple ][+ Emulator")
+      _tcscpy(title,g_bApple2e ? TITLE : (g_bApple2plus ? TEXT("Apple ][+ Emulator")
 						  : TEXT("Apple ][ Emulator")));
       switch (g_nAppMode) {
         case MODE_PAUSED:   _tcscat(title,TEXT(" [Paused]"));    break;
@@ -872,7 +872,7 @@ void ProcessButtonClick (int button) {
     case BTN_HELP:
       {
         TCHAR filename[MAX_PATH];
-        _tcscpy(filename,progdir);
+        _tcscpy(filename,g_sProgramDir);
         _tcscat(filename,TEXT("APPLEWIN.CHM"));
         HtmlHelp(g_hFrameWindow,filename,HH_DISPLAY_TOC,0);
         helpquit = 1;
@@ -1128,8 +1128,8 @@ void FrameCreateWindow () {
   if (!RegLoadValue(TEXT("Preferences"),TEXT("Window Y-Position"),1,(DWORD *)&ypos))
     ypos = (GetSystemMetrics(SM_CYSCREEN)-height) >> 1;
   g_hFrameWindow = CreateWindow(TEXT("APPLE2FRAME"),
-				apple2e ? TITLE
-                                        : (apple2plus ? TEXT("Apple ][+ Emulator")
+				g_bApple2e ? TITLE
+                                        : (g_bApple2plus ? TEXT("Apple ][+ Emulator")
 					              : TEXT("Apple ][ Emulator")),
 				WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU |
 				WS_MINIMIZEBOX | WS_VISIBLE,