cleanup: videotype -> g_eVideoType

This commit is contained in:
mpohoreski 2009-02-16 19:13:55 +00:00
parent 2828905bed
commit 400b32f5fd

View File

@ -1,4 +1,4 @@
/* F/*
AppleWin : An Apple //e emulator for Windows AppleWin : An Apple //e emulator for Windows
Copyright (C) 1994-1996, Michael O'Brien Copyright (C) 1994-1996, Michael O'Brien
@ -262,7 +262,7 @@ static eApple2Type GetApple2Type(DWORD NewCompType, DWORD NewCloneType)
// ==================================================================== // ====================================================================
void Config_Save_Video() void Config_Save_Video()
{ {
REGSAVE(TEXT(REGVALUE_VIDEO_MODE ),videotype); REGSAVE(TEXT(REGVALUE_VIDEO_MODE ),g_eVideoType);
REGSAVE(TEXT(REGVALUE_VIDEO_HALF_SCAN_LINES),g_uHalfScanLines); REGSAVE(TEXT(REGVALUE_VIDEO_HALF_SCAN_LINES),g_uHalfScanLines);
REGSAVE(TEXT(REGVALUE_VIDEO_MONO_COLOR ),monochrome); REGSAVE(TEXT(REGVALUE_VIDEO_MONO_COLOR ),monochrome);
} }
@ -270,7 +270,7 @@ void Config_Save_Video()
// ==================================================================== // ====================================================================
void Config_Load_Video() void Config_Load_Video()
{ {
REGLOAD(TEXT(REGVALUE_VIDEO_MODE ),&videotype); REGLOAD(TEXT(REGVALUE_VIDEO_MODE ),&g_eVideoType);
REGLOAD(TEXT(REGVALUE_VIDEO_HALF_SCAN_LINES),&g_uHalfScanLines); REGLOAD(TEXT(REGVALUE_VIDEO_HALF_SCAN_LINES),&g_uHalfScanLines);
REGLOAD(TEXT(REGVALUE_VIDEO_MONO_COLOR ),&monochrome); REGLOAD(TEXT(REGVALUE_VIDEO_MONO_COLOR ),&monochrome);
} }
@ -306,9 +306,9 @@ static void ConfigDlg_OK(HWND window, UINT afterclose)
} }
} }
if (videotype != newvidtype) if (g_eVideoType != newvidtype)
{ {
videotype = newvidtype; g_eVideoType = newvidtype;
VideoReinitialize(); VideoReinitialize();
if ((g_nAppMode != MODE_LOGO) && (g_nAppMode != MODE_DEBUG)) if ((g_nAppMode != MODE_LOGO) && (g_nAppMode != MODE_DEBUG))
{ {
@ -464,7 +464,7 @@ static BOOL CALLBACK ConfigDlgProc (HWND window,
else else
FillComboBox(window,IDC_COMPUTER,computerchoices,iApple2String); FillComboBox(window,IDC_COMPUTER,computerchoices,iApple2String);
FillComboBox(window,IDC_VIDEOTYPE,videochoices,videotype); FillComboBox(window,IDC_VIDEOTYPE,videochoices,g_eVideoType);
CheckDlgButton(window, IDC_CHECK_HALF_SCAN_LINES, g_uHalfScanLines ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(window, IDC_CHECK_HALF_SCAN_LINES, g_uHalfScanLines ? BST_CHECKED : BST_UNCHECKED);
FillComboBox(window,IDC_SERIALPORT,serialchoices,sg_SSC.GetSerialPort()); FillComboBox(window,IDC_SERIALPORT,serialchoices,sg_SSC.GetSerialPort());