diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp index 9e88dc481..11f02a83d 100644 --- a/desmume/src/windows/main.cpp +++ b/desmume/src/windows/main.cpp @@ -2524,9 +2524,7 @@ int MenuInit() ResetSaveStateTimes(); HMENU configMenu = GetSubMenuByIdOfFirstChild(mainMenu, IDM_3DCONFIG); - HMENU advancedMenu = GetSubMenuByIdOfFirstChild(configMenu, ID_ADVANCED); HMENU toolsMenu = GetSubMenuByIdOfFirstChild(mainMenu, IDM_DISASSEMBLER); - DeleteMenu(advancedMenu,ID_ADVANCED,MF_BYCOMMAND); #ifndef DEVELOPER_MENU_ITEMS // menu items that are only useful for desmume developers (maybe) @@ -2534,27 +2532,29 @@ int MenuInit() DeleteMenu(fileMenu, IDM_FILE_RECORDUSERSPUWAV, MF_BYCOMMAND); #endif -#ifdef DEVELOPER - for(int i=0; iaddMenuItem(IDC_SAVETYPE, false, &mm); - } - memset(&mm, 0, sizeof(MENUITEMINFO)); - mm.cbSize = sizeof(MENUITEMINFO); - mm.fMask = MIIM_TYPE; - mm.fType = MFT_SEPARATOR; - MainWindow->addMenuItem(IDC_SAVETYPE, false, &mm); -#else - DeleteMenu(configMenu,GetSubMenuIndexByHMENU(configMenu,advancedMenu),MF_BYPOSITION); -#endif + //zero 27-mar-2015 - removing this.. its just glitchy and rarely maintained. + //add a different dialog, near the save import (perhaps based on it, where the save is cleared and re-initialized instead of imported) to restore this in the future if needed +//#ifdef DEVELOPER +// for(int i=0; iaddMenuItem(IDC_SAVETYPE, false, &mm); +// } +// memset(&mm, 0, sizeof(MENUITEMINFO)); +// mm.cbSize = sizeof(MENUITEMINFO); +// mm.fMask = MIIM_TYPE; +// mm.fType = MFT_SEPARATOR; +// MainWindow->addMenuItem(IDC_SAVETYPE, false, &mm); +//#else +// DeleteMenu(configMenu,GetSubMenuIndexByHMENU(configMenu,advancedMenu),MF_BYPOSITION); +//#endif if (!gShowConsole) DeleteMenu(toolsMenu, IDM_CONSOLE_ALWAYS_ON_TOP, MF_BYCOMMAND); diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index ef45c4a19..a572daf8d 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -1703,16 +1703,6 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&VSync", ID_DISPLAYMETHOD_VSYNC END - POPUP "Ad&vanced" - BEGIN - MENUITEM "advanced", ID_ADVANCED - POPUP "&Save Type" - BEGIN - MENUITEM "&Autodetect", IDC_SAVETYPE - MENUITEM SEPARATOR - MENUITEM "Force As Current", IDC_SAVETYPE_FORCE - END - END END POPUP "&Tools" BEGIN