Menu
▾
▴
[vba-commit] VisualBoyAdvance/src/win32 BugReport.cpp, 1.4, 1.5 GameOverrides.cpp, 1.3, 1.4 GameOverrides.h, 1.2, 1.3 MainWnd.cpp, 1.24, 1.25 MainWnd.h, 1.10, 1.11 MainWndOptions.cpp, 1.12, 1.13 resource.h, 1.45, 1.46 vba.rc, 1.58, 1.59
Update of /cvsroot/vba/VisualBoyAdvance/src/win32 In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv20933/src/win32 Modified Files: BugReport.cpp GameOverrides.cpp GameOverrides.h MainWnd.cpp MainWnd.h MainWndOptions.cpp resource.h vba.rc Log Message: Removed source code for deactivated "remove intros" feature. Added comment field to vba-over Index: BugReport.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/BugReport.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** BugReport.cpp 25 Jun 2005 06:18:35 -0000 1.4 --- BugReport.cpp 1 Aug 2006 19:21:16 -0000 1.5 *************** *** 217,221 **** AppendFormat(report, "Skip BIOS : %d\r\n", theApp.skipBiosFile); AppendFormat(report, "Disable SFX : %d\r\n", cpuDisableSfx); - AppendFormat(report, "Skip intro : %d\r\n", theApp.removeIntros); AppendFormat(report, "Throttle : %d\r\n", theApp.throttle); AppendFormat(report, "Rewind : %d\r\n", theApp.rewindTimer); --- 217,220 ---- Index: GameOverrides.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GameOverrides.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GameOverrides.cpp 30 Apr 2006 14:31:34 -0000 1.3 --- GameOverrides.cpp 1 Aug 2006 19:21:16 -0000 1.4 *************** *** 46,57 **** void GameOverrides::DoDataExchange(CDataExchange* pDX) { ! CDialog::DoDataExchange(pDX); ! //{{AFX_DATA_MAP(GameOverrides) ! DDX_Control(pDX, IDC_NAME, m_name); ! DDX_Control(pDX, IDC_MIRRORING, m_mirroring); ! DDX_Control(pDX, IDC_FLASH_SIZE, m_flashSize); ! DDX_Control(pDX, IDC_SAVE_TYPE, m_saveType); ! DDX_Control(pDX, IDC_RTC, m_rtc); ! //}}AFX_DATA_MAP } --- 46,58 ---- void GameOverrides::DoDataExchange(CDataExchange* pDX) { ! CDialog::DoDataExchange(pDX); ! //{{AFX_DATA_MAP(GameOverrides) ! DDX_Control(pDX, IDC_NAME, m_name); ! DDX_Control(pDX, IDC_MIRRORING, m_mirroring); ! DDX_Control(pDX, IDC_FLASH_SIZE, m_flashSize); ! DDX_Control(pDX, IDC_SAVE_TYPE, m_saveType); ! DDX_Control(pDX, IDC_RTC, m_rtc); ! DDX_Control(pDX, IDC_COMMENT, m_comment); ! //}}AFX_DATA_MAP } *************** *** 82,85 **** --- 83,90 ---- strcat(tempName, "\\vba-over.ini"); + char comment[0xFF]; + m_comment.GetWindowText(comment, 0xFF); + WritePrivateProfileString(buffer, "comment", !strncmp(comment, "", 0xFF) ? NULL : comment, tempName); + int rtc = m_rtc.GetCurSel(); int flash = m_flashSize.GetCurSel(); *************** *** 217,221 **** m_name.SetWindowText(buffer); ! UINT v = GetPrivateProfileInt(buffer, "rtcEnabled", --- 222,235 ---- m_name.SetWindowText(buffer); ! ! char comment[0xFF]; ! GetPrivateProfileString(buffer, ! "comment", ! "", ! comment, ! 0xFF, ! tempName); ! m_comment.SetWindowText(comment); ! UINT v = GetPrivateProfileInt(buffer, "rtcEnabled", Index: MainWnd.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.cpp,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** MainWnd.cpp 31 Jul 2006 15:51:01 -0000 1.24 --- MainWnd.cpp 1 Aug 2006 19:21:16 -0000 1.25 *************** *** 194,199 **** ON_COMMAND(ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE, OnOptionsEmulatorSpeeduptoggle) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE, OnUpdateOptionsEmulatorSpeeduptoggle) - ON_COMMAND(ID_OPTIONS_EMULATOR_REMOVEINTROSGBA, OnOptionsEmulatorRemoveintrosgba) - ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_REMOVEINTROSGBA, OnUpdateOptionsEmulatorRemoveintrosgba) ON_COMMAND(ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH, OnOptionsEmulatorAutomaticallyipspatch) ON_UPDATE_COMMAND_UI(ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH, OnUpdateOptionsEmulatorAutomaticallyipspatch) --- 194,197 ---- Index: MainWnd.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWnd.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MainWnd.h 12 Jun 2006 11:09:04 -0000 1.10 --- MainWnd.h 1 Aug 2006 19:21:16 -0000 1.11 *************** *** 222,227 **** afx_msg void OnOptionsEmulatorSpeeduptoggle(); afx_msg void OnUpdateOptionsEmulatorSpeeduptoggle(CCmdUI* pCmdUI); - afx_msg void OnOptionsEmulatorRemoveintrosgba(); - afx_msg void OnUpdateOptionsEmulatorRemoveintrosgba(CCmdUI* pCmdUI); afx_msg void OnOptionsEmulatorAutomaticallyipspatch(); afx_msg void OnUpdateOptionsEmulatorAutomaticallyipspatch(CCmdUI* pCmdUI); --- 222,225 ---- Index: GameOverrides.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/GameOverrides.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GameOverrides.h 25 Jun 2005 06:19:04 -0000 1.2 --- GameOverrides.h 1 Aug 2006 19:21:16 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include "afxwin.h" #if !defined(AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_) #define AFX_GAMEOVERRIDES_H__EEEFE37F_F477_455D_8682_705FB2DBCC0C__INCLUDED_ *************** *** 64,67 **** --- 65,70 ---- //}}AFX_MSG DECLARE_MESSAGE_MAP() + public: + CEdit m_comment; }; Index: vba.rc =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/vba.rc,v retrieving revision 1.58 retrieving revision 1.59 diff -C2 -d -r1.58 -r1.59 *** vba.rc 31 Jul 2006 15:51:01 -0000 1.58 --- vba.rc 1 Aug 2006 19:21:16 -0000 1.59 *************** *** 29,34 **** // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! IDI_ICON ICON "ico00002.ico" ! ///////////////////////////////////////////////////////////////////////////// --- 29,33 ---- // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. ! IDI_ICON ICON "vbavista.ico" ///////////////////////////////////////////////////////////////////////////// *************** *** 141,145 **** FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON IDI_ICON,IDC_STATIC,6,6,20,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 --- 140,144 ---- FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! ICON 101,IDC_STATIC,6,6,20,20 CTEXT "VisualBoyAdvance Emulator",IDC_STATIC,30,6,120,8 CTEXT "Copyright © 2006 VBA development team",IDC_STATIC,6,36,144,8 *************** *** 1077,1098 **** END ! IDD_GAME_OVERRIDES DIALOG 0, 0, 271, 138 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game overrides" ! FONT 8, "MS Sans Serif" BEGIN ! COMBOBOX IDC_RTC,152,35,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_SAVE_TYPE,152,55,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_FLASH_SIZE,152,76,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_MIRRORING,152,97,112,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "OK",IDOK,7,117,50,14 ! PUSHBUTTON "Defaults",IDC_DEFAULTS,110,117,50,14 ! PUSHBUTTON "Cancel",IDCANCEL,213,117,50,14 ! LTEXT "Overrides for game:",IDC_STATIC,7,17,140,8 ! EDITTEXT IDC_NAME,152,15,112,14,ES_AUTOHSCROLL | WS_DISABLED ! LTEXT "Real Time Clock:",IDC_STATIC,7,37,140,8 ! LTEXT "Save Type:",IDC_STATIC,7,57,140,8 ! LTEXT "Flash Size:",IDC_STATIC,7,77,140,8 ! LTEXT "Mirroring:",IDC_STATIC,7,97,140,8 END --- 1076,1099 ---- END ! IDD_GAME_OVERRIDES DIALOGEX 0, 0, 268, 132 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game overrides" ! FONT 8, "MS Sans Serif", 0, 0, 0x0 BEGIN ! COMBOBOX IDC_RTC,84,42,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_SAVE_TYPE,84,60,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_FLASH_SIZE,84,78,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! COMBOBOX IDC_MIRRORING,84,96,180,12,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP ! DEFPUSHBUTTON "OK",IDOK,6,114,72,12 ! PUSHBUTTON "Defaults",IDC_DEFAULTS,108,114,54,12 ! PUSHBUTTON "Cancel",IDCANCEL,192,114,72,12 ! LTEXT "Game Code",IDC_STATIC,6,6,72,12 ! EDITTEXT IDC_NAME,84,6,180,12,ES_AUTOHSCROLL | WS_DISABLED ! LTEXT "Real Time Clock:",IDC_STATIC,6,42,72,12 ! LTEXT "Save Type:",IDC_STATIC,6,60,72,12 ! LTEXT "Flash Size:",IDC_STATIC,6,78,72,12 ! LTEXT "Mirroring:",IDC_STATIC,6,96,72,12 ! LTEXT "Comment",IDC_STATIC,6,24,72,12 ! EDITTEXT IDC_COMMENT,84,24,180,12,ES_AUTOHSCROLL END *************** *** 1442,1448 **** BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 264 TOPMARGIN, 7 ! BOTTOMMARGIN, 111 END END --- 1443,1449 ---- BEGIN LEFTMARGIN, 7 ! RIGHTMARGIN, 261 TOPMARGIN, 7 ! BOTTOMMARGIN, 105 END END *************** *** 1612,1616 **** MENUITEM "Pause when inactive window", ID_OPTIONS_EMULATOR_PAUSEWHENINACTIVE MENUITEM "Speed up toggle", ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE - MENUITEM "Remove intros (GBA)", ID_OPTIONS_EMULATOR_REMOVEINTROSGBA MENUITEM "Automatic IPS patching", ID_OPTIONS_EMULATOR_AUTOMATICALLYIPSPATCH MENUITEM "AGB Print", ID_OPTIONS_EMULATOR_AGBPRINT --- 1613,1616 ---- Index: resource.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/resource.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** resource.h 31 Jul 2006 15:51:01 -0000 1.45 --- resource.h 1 Aug 2006 19:21:16 -0000 1.46 *************** *** 47,55 **** #define IDS_WRONG_GAMESHARK_CODE 42 #define IDS_UNSUPPORTED_GAMESHARK_CODE 43 - #define IDI_ICON 101 #define IDD_REGISTERS 102 #define IDD_DEBUG 103 #define IDR_MENU 104 #define IDD_ABOUT 105 #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 --- 47,55 ---- #define IDS_WRONG_GAMESHARK_CODE 42 #define IDS_UNSUPPORTED_GAMESHARK_CODE 43 #define IDD_REGISTERS 102 #define IDD_DEBUG 103 #define IDR_MENU 104 #define IDD_ABOUT 105 + #define IDI_ICON 105 #define IDR_ACCELERATOR 106 #define IDD_CHEATS 107 *************** *** 500,503 **** --- 500,504 ---- #define IDC_FLASH_SIZE 1257 #define IDC_BIT_8 1258 + #define IDC_COMMENT 1258 #define IDC_BIT_9 1259 #define IDC_BIT_10 1260 *************** *** 652,656 **** #define ID_OPTIONS_EMULATOR_SPEEDHACK 40157 #define ID_OPTIONS_EMULATOR_SPEEDUPTOGGLE 40158 - #define ID_OPTIONS_EMULATOR_REMOVEINTROSGBA 40159 #define ID_OPTIONS_FILTER16BIT_ADVANCEMAMESCALE2X 40160 #define ID_OPTIONS_FILTER16BIT_SIMPLE2X 40161 --- 653,656 ---- *************** *** 759,763 **** #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 105 #endif #endif --- 759,763 ---- #define _APS_NEXT_COMMAND_VALUE 40278 #define _APS_NEXT_CONTROL_VALUE 1256 ! #define _APS_NEXT_SYMED_VALUE 106 #endif #endif Index: MainWndOptions.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/win32/MainWndOptions.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MainWndOptions.cpp 31 Jul 2006 15:51:01 -0000 1.12 --- MainWndOptions.cpp 1 Aug 2006 19:21:16 -0000 1.13 *************** *** 715,729 **** } - void MainWnd::OnOptionsEmulatorRemoveintrosgba() - { - // theApp.removeIntros = !theApp.removeIntros; - } - - void MainWnd::OnUpdateOptionsEmulatorRemoveintrosgba(CCmdUI* pCmdUI) - { - pCmdUI->Enable(false); - // pCmdUI->SetCheck(theApp.removeIntros); - } - void MainWnd::OnOptionsEmulatorAutomaticallyipspatch() { --- 715,718 ---- |
