| version 1.29, 2004/02/18 06:19:01 | version 1.36, 2004/05/21 15:02:31 | 
| Line 53  static BYTE  scrnmode; | Line 53  static BYTE  scrnmode; | 
 | #endif | #endif | 
 | static  char    target[MAX_PATH] = DEFAULTPATH; | static  char    target[MAX_PATH] = DEFAULTPATH; | 
 |  |  | 
 |  | #if !defined(SUPPORT_PC9821) | 
 |  | static const char np2app[] = "np2"; | 
 |  | #else | 
 |  | static const char np2app[] = "np21"; | 
 |  | #endif | 
 |  |  | 
 | static const char np2resume[] = "sav"; | static const char np2resume[] = "sav"; | 
 |  |  | 
| Line 151  static void MenuBarInit(void) { | Line 156  static void MenuBarInit(void) { | 
 | EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE)); | EnableItem(GetMenuHandle(IDM_DEVICE), LoWord(IDM_MOUSE)); | 
 | EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE)); | EnableItem(GetMenuHandle(IDM_KEYBOARD), LoWord(IDM_F12MOUSE)); | 
 | #endif | #endif | 
 |  |  | 
 |  | if (!(np2cfg.fddequip & 1)) { | 
 |  | DeleteMenu(IDM_FDD1); | 
 |  | } | 
 |  | if (!(np2cfg.fddequip & 2)) { | 
 |  | DeleteMenu(IDM_FDD2); | 
 |  | } | 
 |  | if (!(np2cfg.fddequip & 4)) { | 
 |  | DeleteMenu(IDM_FDD3); | 
 |  | } | 
 |  | if (!(np2cfg.fddequip & 8)) { | 
 |  | DeleteMenu(IDM_FDD4); | 
 |  | } | 
 |  |  | 
 | DrawMenuBar(); | DrawMenuBar(); | 
 | } | } | 
 |  |  | 
| Line 207  static void HandleMenuChoice(long wParam | Line 226  static void HandleMenuChoice(long wParam | 
 | diskdrv_setfdd(1, NULL, 0); | diskdrv_setfdd(1, NULL, 0); | 
 | break; | break; | 
 |  |  | 
 |  | case IDM_FDD3OPEN: | 
 |  | dialog_changefdd(2); | 
 |  | break; | 
 |  |  | 
 |  | case IDM_FDD3EJECT: | 
 |  | diskdrv_setfdd(2, NULL, 0); | 
 |  | break; | 
 |  |  | 
 |  | case IDM_FDD4OPEN: | 
 |  | dialog_changefdd(3); | 
 |  | break; | 
 |  |  | 
 |  | case IDM_FDD4EJECT: | 
 |  | diskdrv_setfdd(3, NULL, 0); | 
 |  | break; | 
 |  |  | 
 | case IDM_SASI1OPEN: | case IDM_SASI1OPEN: | 
 | dialog_changehdd(0x00); | dialog_changehdd(0x00); | 
 | break; | break; | 
| Line 322  static void HandleMenuChoice(long wParam | Line 357  static void HandleMenuChoice(long wParam | 
 | update |= SYS_UPDATECFG; | update |= SYS_UPDATECFG; | 
 | break; | break; | 
 |  |  | 
 |  | case IDM_MIDIOPT: | 
 |  | MPU98DialogProc(); | 
 |  | break; | 
 |  |  | 
 | case IDM_MIDIPANIC: | case IDM_MIDIPANIC: | 
 | rs232c_midipanic(); | rs232c_midipanic(); | 
 | mpu98ii_midipanic(); | mpu98ii_midipanic(); | 
| Line 522  static void HandleMenuChoice(long wParam | Line 561  static void HandleMenuChoice(long wParam | 
 | update |= SYS_UPDATECFG; | update |= SYS_UPDATECFG; | 
 | break; | break; | 
 |  |  | 
 |  | case IDM_MEM116: | 
 |  | menu_setextmem(11); | 
 |  | update |= SYS_UPDATECFG; | 
 |  | break; | 
 |  |  | 
 |  | case IDM_MEM136: | 
 |  | menu_setextmem(13); | 
 |  | update |= SYS_UPDATECFG; | 
 |  | break; | 
 |  |  | 
 | case IDM_BMPSAVE: | case IDM_BMPSAVE: | 
 | dialog_writebmp(); | dialog_writebmp(); | 
 | break; | break; | 
| Line 711  static void processwait(UINT waitcnt) { | Line 760  static void processwait(UINT waitcnt) { | 
 |  |  | 
 | static void getstatfilename(char *path, const char *ext, int size) { | static void getstatfilename(char *path, const char *ext, int size) { | 
 |  |  | 
| file_cpyname(path, file_getcd("np2"), size); | file_cpyname(path, file_getcd(np2app), size); | 
 | file_catname(path, str_dot, size); | file_catname(path, str_dot, size); | 
 | file_catname(path, ext, size); | file_catname(path, ext, size); | 
 | } | } | 
| Line 742  static int flagload(const char *ext) { | Line 791  static int flagload(const char *ext) { | 
 | ret = IDOK; | ret = IDOK; | 
 | getstatfilename(path, ext, sizeof(path)); | getstatfilename(path, ext, sizeof(path)); | 
 | r = statsave_check(path, buf, sizeof(buf)); | r = statsave_check(path, buf, sizeof(buf)); | 
| if (r & (~NP2FLAG_DISKCHG)) { | if (r & (~STATFLAG_DISKCHG)) { | 
 | ResumeErrorDialogProc(); | ResumeErrorDialogProc(); | 
 | ret = IDCANCEL; | ret = IDCANCEL; | 
 | } | } | 
| else if (r & NP2FLAG_DISKCHG) { | else if (r & STATFLAG_DISKCHG) { | 
 | ret = ResumeWarningDialogProc(buf); | ret = ResumeWarningDialogProc(buf); | 
 | } | } | 
 | if (ret == IDOK) { | if (ret == IDOK) { | 
| Line 768  int main(int argc, char *argv[]) { | Line 817  int main(int argc, char *argv[]) { | 
 |  |  | 
 | InitToolBox(); | InitToolBox(); | 
 | macossub_init(); | macossub_init(); | 
 | MenuBarInit(); |  | 
 |  |  | 
 | initload(); | initload(); | 
 |  |  | 
 |  | MenuBarInit(); | 
 |  |  | 
 | TRACEINIT(); | TRACEINIT(); | 
 |  |  | 
 |  | keystat_initialize(); | 
 |  |  | 
 | SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100); | SetRect(&wRect, np2oscfg.posx, np2oscfg.posy, 100, 100); | 
 |  | #if !defined(SUPPORT_PC9821) | 
 | hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE, | hWndMain = NewWindow(0, &wRect, "\pNeko Project II", FALSE, | 
 | noGrowDocProc, (WindowPtr)-1, TRUE, 0); | noGrowDocProc, (WindowPtr)-1, TRUE, 0); | 
 |  | #else | 
 |  | hWndMain = NewWindow(0, &wRect, "\pNeko Project 21", FALSE, | 
 |  | noGrowDocProc, (WindowPtr)-1, TRUE, 0); | 
 |  | #endif | 
 | if (!hWndMain) { | if (!hWndMain) { | 
 | TRACETERM(); | TRACETERM(); | 
 | macossub_term(); | macossub_term(); |