Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-11 05:29:55 +00:00
Code Issues Projects Releases Wiki Activity

Renamed globals to match coding convention:

Browse Source 
g_bApple2e
g_bApple2plus
g_sProgramDir
This commit is contained in:
mpohoreski 2006-06-25 03:46:33 +00:00
parent 011b59ad4d
commit 2fc141b1b6
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AppleWin/source/Disk.cpp
View File

@ -349,7 +349,7 @@ void DiskInitialize () {
while (loop--) while (loop--)
ZeroMemory(&g_aFloppyDisk[loop],sizeof(Disk_t )); ZeroMemory(&g_aFloppyDisk[loop],sizeof(Disk_t ));
TCHAR imagefilename[MAX_PATH]; TCHAR imagefilename[MAX_PATH];
_tcscpy(imagefilename,progdir); _tcscpy(imagefilename,g_sProgramDir);
_tcscat(imagefilename,TEXT("MASTER.DSK")); // TODO: Should remember last disk by user _tcscat(imagefilename,TEXT("MASTER.DSK")); // TODO: Should remember last disk by user
DiskInsert(0,imagefilename,0,0); DiskInsert(0,imagefilename,0,0);
} }
@ -469,7 +469,7 @@ void DiskSelectImage (int drive, LPSTR pszFilename)
strcpy(filename, 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 ")); _tcscpy(title,TEXT("Select Disk Image For Drive "));
_tcscat(title,drive ? TEXT("2") : TEXT("1")); _tcscat(title,drive ? TEXT("2") : TEXT("1"));
@ -497,7 +497,7 @@ void DiskSelectImage (int drive, LPSTR pszFilename)
{ {
filename[ofn.nFileOffset] = 0; filename[ofn.nFileOffset] = 0;
if (_tcsicmp(directory,filename)) if (_tcsicmp(directory,filename))
RegSaveString(TEXT("Preferences"),TEXT("Starting Directory"),1,filename); RegSaveString(TEXT("Preferences"),REGVALUE_PREF_START_DIR,1,filename);
} }
else else
{ {

12
AppleWin/source/Frame.cpp
View File

@ -347,7 +347,7 @@ void DrawStatusArea (HDC passdc, int drawflags) {
TextOut(dc,x+ 3,y+2,TEXT("1"),1); TextOut(dc,x+ 3,y+2,TEXT("1"),1);
SetTextColor(dc,RGB((iDrive2Status==2 ? 255 : 0),(iDrive2Status==1 ? 255 : 0),0)); SetTextColor(dc,RGB((iDrive2Status==2 ? 255 : 0),(iDrive2Status==1 ? 255 : 0),0));
TextOut(dc,x+13,y+2,TEXT("2"),1); TextOut(dc,x+13,y+2,TEXT("2"),1);
if (apple2e) { if (g_bApple2e) {
SetTextAlign(dc,TA_RIGHT | TA_TOP); SetTextAlign(dc,TA_RIGHT | TA_TOP);
SetTextColor(dc,(caps ? RGB(128,128,128) : SetTextColor(dc,(caps ? RGB(128,128,128) :
RGB( 0, 0, 0))); RGB( 0, 0, 0)));
@ -377,14 +377,14 @@ void DrawStatusArea (HDC passdc, int drawflags) {
RECT rect = {0,0,8,8}; RECT rect = {0,0,8,8};
DrawBitmapRect(dc,x+12,y+8,&rect,diskbitmap[iDrive1Status]); DrawBitmapRect(dc,x+12,y+8,&rect,diskbitmap[iDrive1Status]);
DrawBitmapRect(dc,x+30,y+8,&rect,diskbitmap[iDrive2Status]); DrawBitmapRect(dc,x+30,y+8,&rect,diskbitmap[iDrive2Status]);
if (apple2e) { if (g_bApple2e) {
RECT rect = {0,0,30,8}; RECT rect = {0,0,30,8};
DrawBitmapRect(dc,x+7,y+19,&rect,capsbitmap[caps != 0]); DrawBitmapRect(dc,x+7,y+19,&rect,capsbitmap[caps != 0]);
} }
} }
if (drawflags & DRAW_TITLE) { if (drawflags & DRAW_TITLE) {
TCHAR title[40]; TCHAR title[40];
_tcscpy(title,apple2e ? TITLE : (apple2plus ? TEXT("Apple ][+ Emulator") _tcscpy(title,g_bApple2e ? TITLE : (g_bApple2plus ? TEXT("Apple ][+ Emulator")
: TEXT("Apple ][ Emulator"))); : TEXT("Apple ][ Emulator")));
switch (g_nAppMode) { switch (g_nAppMode) {
case MODE_PAUSED: _tcscat(title,TEXT(" [Paused]")); break; case MODE_PAUSED: _tcscat(title,TEXT(" [Paused]")); break;
@ -872,7 +872,7 @@ void ProcessButtonClick (int button) {
case BTN_HELP: case BTN_HELP:
{ {
TCHAR filename[MAX_PATH]; TCHAR filename[MAX_PATH];
_tcscpy(filename,progdir); _tcscpy(filename,g_sProgramDir);
_tcscat(filename,TEXT("APPLEWIN.CHM")); _tcscat(filename,TEXT("APPLEWIN.CHM"));
HtmlHelp(g_hFrameWindow,filename,HH_DISPLAY_TOC,0); HtmlHelp(g_hFrameWindow,filename,HH_DISPLAY_TOC,0);
helpquit = 1; helpquit = 1;
@ -1128,8 +1128,8 @@ void FrameCreateWindow () {
if (!RegLoadValue(TEXT("Preferences"),TEXT("Window Y-Position"),1,(DWORD *)&ypos)) if (!RegLoadValue(TEXT("Preferences"),TEXT("Window Y-Position"),1,(DWORD *)&ypos))
ypos = (GetSystemMetrics(SM_CYSCREEN)-height) >> 1; ypos = (GetSystemMetrics(SM_CYSCREEN)-height) >> 1;
g_hFrameWindow = CreateWindow(TEXT("APPLE2FRAME"), g_hFrameWindow = CreateWindow(TEXT("APPLE2FRAME"),
apple2e ? TITLE g_bApple2e ? TITLE
: (apple2plus ? TEXT("Apple ][+ Emulator") : (g_bApple2plus ? TEXT("Apple ][+ Emulator")
: TEXT("Apple ][ Emulator")), : TEXT("Apple ][ Emulator")),
WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU |
WS_MINIMIZEBOX | WS_VISIBLE, WS_MINIMIZEBOX | WS_VISIBLE,