took drnach's dmg association and expanded on it :)

looks like the branch doesn't have properties assigned

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1062 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
squall-leonhart 2011-12-28 13:05:40 +00:00
parent 88de75eb7d
commit 7f627ac7b0
5 changed files with 2349 additions and 2346 deletions

View File

@ -21,6 +21,7 @@
extern u8 *pix;
extern bool speedup;
bool gbUpdateSizes();
bool inBios = false;
// debugging
@ -608,10 +609,10 @@ bool gbIsGameboyRom(char * file)
char * p = strrchr(file,'.');
if(p != NULL) {
if(_stricmp(p, ".dmg") == 0)
return true;
if(_stricmp(p, ".gb") == 0)
return true;
if(_stricmp(p, ".dmg") == 0)
return true;
if(_stricmp(p, ".gbc") == 0)
return true;
if(_stricmp(p, ".cgb") == 0)

View File

@ -36,7 +36,7 @@ void Associate::DoDataExchange(CDataExchange* pDX)
DDX_Check(pDX, IDC_AGB, m_agb);
DDX_Check(pDX, IDC_BIN, m_bin);
DDX_Check(pDX, IDC_CGB, m_cgb);
DDX_Check(pDX, IDC_GB, m_dmg);
DDX_Check(pDX, IDC_DMG, m_dmg);
DDX_Check(pDX, IDC_GB, m_gb);
DDX_Check(pDX, IDC_GBA, m_gba);
DDX_Check(pDX, IDC_GBC, m_gbc);
@ -50,7 +50,7 @@ BEGIN_MESSAGE_MAP(Associate, CDialog)
ON_BN_CLICKED(ID_CANCEL, OnCancel)
ON_BN_CLICKED(ID_OK, OnOk)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// Associate message handlers
@ -75,9 +75,9 @@ void Associate::OnOk()
UpdateData();
int mask = 0;
if(m_dmg)
mask |= 1;
if(m_gb)
mask |= 1;
if(m_dmg)
mask |= 2;
if(m_sgb)
mask |= 4;

View File

@ -47,7 +47,7 @@ class Associate : public CDialog
afx_msg void OnOk();
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.

View File

@ -202,7 +202,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
ICON IDI_MAINICON,IDC_STATIC,6,6,20,20
CTEXT "VisualBoyAdvance-M Emulator",IDC_STATIC,36,6,138,8
CTEXT "Copyright <EFBFBD> 2008 VBA-M development team",IDC_STATIC,6,48,168,8
CTEXT "Copyright © 2008 VBA-M development team",IDC_STATIC,6,48,168,8
CTEXT "http://vba-m.com",IDC_URL,7,138,168,8
RTEXT "Version:",IDC_STATIC,36,18,54,8
LTEXT "",IDC_VERSION,96,18,78,8,SS_NOPREFIX
@ -358,22 +358,23 @@ BEGIN
GROUPBOX "Add",IDC_STATIC,5,199,268,27
END
IDD_ASSOCIATIONS DIALOG 0, 0, 116, 95
IDD_ASSOCIATIONS DIALOGEX 0, 0, 116, 110
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Associations"
FONT 8, "MS Sans Serif"
FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
CONTROL ".gb",IDC_GB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,15,26,10
CONTROL ".sgb",IDC_SGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,29,29,10
CONTROL ".cgb",IDC_CGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,43,30,10
CONTROL ".gbc",IDC_GBC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,57,30,10
CONTROL ".gb",IDC_GB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,13,26,10
CONTROL ".dmg",IDC_DMG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,27,30,10
CONTROL ".sgb",IDC_SGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,41,29,10
CONTROL ".cgb",IDC_CGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,55,30,10
CONTROL ".gbc",IDC_GBC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,30,10
CONTROL ".gba",IDC_GBA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,13,30,10
CONTROL ".agb",IDC_AGB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,27,30,10
CONTROL ".bin",IDC_BIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,41,27,10
DEFPUSHBUTTON "OK",ID_OK,3,78,50,14
PUSHBUTTON "Cancel",ID_CANCEL,63,78,50,14
DEFPUSHBUTTON "OK",ID_OK,3,89,50,14
PUSHBUTTON "Cancel",ID_CANCEL,63,89,50,14
GROUPBOX "GBA Types",IDC_STATIC,63,3,50,51
GROUPBOX "GB Types",IDC_STATIC,3,3,50,69
GROUPBOX "GB Types",IDC_STATIC,3,3,50,79
END
IDD_GBA_ROM_INFO DIALOGEX 0, 0, 220, 142
@ -1296,7 +1297,7 @@ BEGIN
LEFTMARGIN, 7
RIGHTMARGIN, 109
TOPMARGIN, 7
BOTTOMMARGIN, 88
BOTTOMMARGIN, 103
END
IDD_GBA_ROM_INFO, DIALOG
@ -1609,7 +1610,7 @@ BEGIN
VALUE "FileDescription", "VisualBoyAdvance-M"
VALUE "FileVersion", "1, 8, 0, 0"
VALUE "InternalName", "VBA-M"
VALUE "LegalCopyright", "Copyright <EFBFBD> 2008-2009 VBA-M development team"
VALUE "LegalCopyright", "Copyright © 2008-2009 VBA-M development team"
VALUE "OriginalFilename", "VisualBoyAdvance-M.exe"
VALUE "ProductName", "GB/C/A emulator for Windows"
VALUE "ProductVersion", "1, 8, 0, 0"
@ -2263,7 +2264,7 @@ BEGIN
IDS_ADD_CBA_CODE "Add CodeBreakerAdvance code"
IDS_FILTER_WAV "Wave file_*.WAV__"
IDS_SELECT_WAV_NAME "Select wave file name"
IDS_FILTER_GBROM "Game Boy ROMs (*.DMG;*.GB;*.SGB;*.ZIP;*.7Z;*.Z;*.GZ)_*.DMG;*.GB;*.SGB;*.ZIP;*.7Z;*.Z;*.GZ__"
IDS_FILTER_GBROM "Game Boy ROMs (*.GB;*.DMG;*.SGB;*.ZIP;*.7Z;*.Z;*.GZ)_*.GB;*.DMG;*.SGB;*.ZIP;*.7Z;*.Z;*.GZ__"
IDS_FILTER_PAL "Windows Palette (*.PAL)_*.PAL_PaintShop Palette (*.PAL)_*.PAL_Adobe Color Table (*.ACT)_*.ACT__"
IDS_SELECT_PALETTE_NAME "Select palette name:"
IDS_SEARCH_PRODUCED_NO_RESULTS "Search produced no results."

View File

@ -288,6 +288,7 @@
#define IDC_GBC 1081
#define IDC_ROM_MAKER_CODE 1081
#define IDS_CODE 1081
#define IDC_DMG 1082
#define IDC_ROM_UNIT_CODE 1082
#define IDS_DESCRIPTION 1082
#define IDC_ROM_DEVICE_TYPE 1083