ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Open ROM to open Disk instead 

It's a much better idea anyway.
This commit is contained in:
luigiblood 2016-01-26 03:04:48 +01:00
parent f0b81bbfc0
commit 96a6862c80
4 changed files with 40 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Project64-core/Multilanguage.h
View File

@ -63,7 +63,6 @@ enum LanguageStringID{
MENU_RECENT_ROM = 107, MENU_RECENT_ROM = 107,
MENU_RECENT_DIR = 108, MENU_RECENT_DIR = 108,
MENU_EXIT = 109, MENU_EXIT = 109,
MENU_DISK = 110,
//System Menu //System Menu
MENU_SYSTEM = 120, MENU_SYSTEM = 120,

1
Source/Project64-core/Multilanguage/LanguageClass.cpp
View File

@ -71,7 +71,6 @@ void CLanguage::LoadDefaultStrings(void)
DEF_STR(MENU_RECENT_ROM, "Recent ROM"); DEF_STR(MENU_RECENT_ROM, "Recent ROM");
DEF_STR(MENU_RECENT_DIR, "Recent ROM Directories"); DEF_STR(MENU_RECENT_DIR, "Recent ROM Directories");
DEF_STR(MENU_EXIT, "E&xit"); DEF_STR(MENU_EXIT, "E&xit");
DEF_STR(MENU_DISK, "Open Disk");
//System Menu //System Menu
DEF_STR(MENU_SYSTEM, "&System"); DEF_STR(MENU_SYSTEM, "&System");

50
Source/Project64/UserInterface/MainMenuClass.cpp
View File

@ -92,7 +92,7 @@ stdstr CMainMenu::ChooseFileToOpen(HWND hParent)
openfilename.lStructSize = sizeof(openfilename); openfilename.lStructSize = sizeof(openfilename);
openfilename.hwndOwner = (HWND)hParent; openfilename.hwndOwner = (HWND)hParent;
openfilename.lpstrFilter = "N64 ROMs (*.zip, *.7z, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin)\0*.?64;*.zip;*.7z;*.bin;*.rom;*.usa;*.jap;*.pal\0All files (*.*)\0*.*\0"; openfilename.lpstrFilter = "N64 ROMs (*.zip, *.7z, *.?64, *.rom, *.usa, *.jap, *.pal, *.bin, *.ndd)\0*.?64;*.zip;*.7z;*.bin;*.rom;*.usa;*.jap;*.pal;*.ndd\0All files (*.*)\0*.*\0";
openfilename.lpstrFile = FileName; openfilename.lpstrFile = FileName;
openfilename.lpstrInitialDir = Directory; openfilename.lpstrInitialDir = Directory;
openfilename.nMaxFile = MAX_PATH; openfilename.nMaxFile = MAX_PATH;
@ -118,15 +118,20 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
{ {
stdstr File = ChooseFileToOpen(hWnd); stdstr File = ChooseFileToOpen(hWnd);
if (File.length() > 0) if (File.length() > 0)
{
stdstr Test = File.substr(File.length() - 3, 4);
Test.ToLower();
if (!Test.compare(".ndd"))
{ {
g_BaseSystem->RunFileImage(File.c_str()); g_BaseSystem->RunFileImage(File.c_str());
} }
} else
break; {
case ID_FILE_DISK: // Open Disk
if (g_BaseSystem->RunDiskImage(File.c_str()))
{ {
stdstr IPLROM = g_Settings->LoadStringVal(File_DiskIPLPath); stdstr IPLROM = g_Settings->LoadStringVal(File_DiskIPLPath);
if ((IPLROM.length() <= 0) || (!g_BaseSystem->RunFileImageIPL(IPLROM.c_str()))) if ((IPLROM.length() <= 0) || (!g_BaseSystem->RunFileImage(IPLROM.c_str())))
{ {
// Open DDROM // Open DDROM
OPENFILENAME openfilename; OPENFILENAME openfilename;
@ -147,39 +152,14 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
if (GetOpenFileName(&openfilename)) if (GetOpenFileName(&openfilename))
{ {
g_BaseSystem->RunFileImageIPL(FileName); g_BaseSystem->RunFileImage(FileName);
// Open Disk
openfilename.lpstrFilter = "N64DD Disk Image (*.ndd)\0*.ndd\0All files (*.*)\0*.*\0";
if (GetOpenFileName(&openfilename))
{
if (g_BaseSystem->RunDiskImage(FileName))
g_BaseSystem->RunFileImage(g_Settings->LoadStringVal(File_DiskIPLPath).c_str());
}
} }
} }
else else
{ {
// Open Disk g_BaseSystem->RunFileImage(IPLROM.c_str());
OPENFILENAME openfilename; }
char FileName[_MAX_PATH], Directory[_MAX_PATH]; }
memset(&FileName, 0, sizeof(FileName));
memset(&openfilename, 0, sizeof(openfilename));
strcpy(Directory, g_Settings->LoadStringVal(Directory_Game).c_str());
openfilename.lStructSize = sizeof(openfilename);
openfilename.hwndOwner = (HWND)hWnd;
openfilename.lpstrFilter = "N64DD Disk Image (*.ndd)\0*.ndd\0All files (*.*)\0*.*\0";
openfilename.lpstrFile = FileName;
openfilename.lpstrInitialDir = Directory;
openfilename.nMaxFile = MAX_PATH;
openfilename.Flags = OFN_FILEMUSTEXIST | OFN_HIDEREADONLY;
if (GetOpenFileName(&openfilename))
{
if (g_BaseSystem->RunDiskImage(FileName))
g_BaseSystem->RunFileImage(g_Settings->LoadStringVal(File_DiskIPLPath).c_str());
} }
} }
} }
@ -752,8 +732,6 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
MenuItemList FileMenu; MenuItemList FileMenu;
Item.Reset(ID_FILE_OPEN_ROM, MENU_OPEN, m_ShortCuts.ShortCutString(ID_FILE_OPEN_ROM, AccessLevel)); Item.Reset(ID_FILE_OPEN_ROM, MENU_OPEN, m_ShortCuts.ShortCutString(ID_FILE_OPEN_ROM, AccessLevel));
FileMenu.push_back(Item); FileMenu.push_back(Item);
Item.Reset(ID_FILE_DISK, MENU_DISK, m_ShortCuts.ShortCutString(ID_FILE_DISK, AccessLevel));
FileMenu.push_back(Item);
if (!inBasicMode) if (!inBasicMode)
{ {
Item.Reset(ID_FILE_ROM_INFO, MENU_ROM_INFO, m_ShortCuts.ShortCutString(ID_FILE_ROM_INFO, AccessLevel)); Item.Reset(ID_FILE_ROM_INFO, MENU_ROM_INFO, m_ShortCuts.ShortCutString(ID_FILE_ROM_INFO, AccessLevel));

2
Source/Project64/UserInterface/MainMenuClass.h
View File

@ -4,7 +4,7 @@ enum MainMenuID
{ {
//File Menu //File Menu
ID_FILE_OPEN_ROM = 4000, ID_FILE_ROM_INFO, ID_FILE_STARTEMULATION, ID_FILE_ENDEMULATION, ID_FILE_OPEN_ROM = 4000, ID_FILE_ROM_INFO, ID_FILE_STARTEMULATION, ID_FILE_ENDEMULATION,
ID_FILE_ROMDIRECTORY, ID_FILE_REFRESHROMLIST, ID_FILE_EXIT, ID_FILE_DISK, ID_FILE_ROMDIRECTORY, ID_FILE_REFRESHROMLIST, ID_FILE_EXIT,
//language //language
ID_LANG_START, ID_LANG_END = ID_LANG_START + 100, ID_LANG_START, ID_LANG_END = ID_LANG_START + 100,