--- np2/win9x/np2.cpp 2003/10/21 11:22:05 1.5 +++ np2/win9x/np2.cpp 2003/10/23 06:26:16 1.7 @@ -810,6 +810,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT if (LOWORD(wParam) != WA_INACTIVE) { np2break &= ~NP2BREAK_MAIN; scrnmng_update(); + keystat_allrelease(); mouse_running(MOUSE_CONT_M); } else { @@ -1105,13 +1106,11 @@ int WINAPI WinMain(HINSTANCE hInstance, GetModuleFileName(NULL, modulefile, sizeof(modulefile)); dosio_init(); file_setcd(modulefile); - np2arg_analize(lpszCmdLine); // タイミング修正 // ver0.29 + np2arg_analize(lpszCmdLine); initload(); srand((unsigned)time(NULL)); - np2arg_analize(lpszCmdLine); - CopyMemory(szClassName, np2oscfg.winid, 3); if ((hwndorg = FindWindow(szClassName, NULL)) != NULL) { @@ -1369,11 +1368,33 @@ int WINAPI WinMain(HINSTANCE hInstance, } else { // auto skip if (!waitcnt) { + UINT cnt; joy_flash(); mouse_callback(); pccore_exec(framecnt == 0); dclock_callback(); framecnt++; +#if 1 + cnt = timing_getcount(); + if (framecnt > cnt) { + waitcnt = framecnt; + if (framemax > 1) { + framemax--; + } + } + else if (framecnt >= framemax) { + if (framemax < 12) { + framemax++; + } + if (cnt >= 12) { + timing_init(); + } + else { + timing_setcount(cnt - framecnt); + } + framecnt = 0; + } +#else if (timing_getcount() < framecnt) { waitcnt = framecnt; if (framemax > 1) { @@ -1386,6 +1407,7 @@ int WINAPI WinMain(HINSTANCE hInstance, framemax++; } } +#endif } else { processwait(waitcnt);