diff --git a/src/sys/mako.cpp b/src/sys/mako.cpp index 689984b..6cbca1b 100644 --- a/src/sys/mako.cpp +++ b/src/sys/mako.cpp @@ -72,7 +72,7 @@ int MAKO::thread(void* pvoid) pparams->mako->load_mda(next_music); pparams->mako->start_midi(); current_music = next_music; - Sleep(100); + SDL_Delay(100); } else { next_music = 0; } @@ -86,7 +86,7 @@ int MAKO::thread(void* pvoid) if(pparams->next_music == next_music_bak) { pparams->next_music = next_music; } - Sleep(10); + SDL_Delay(10); } // MIDI開放 diff --git a/src/sys/mako.h b/src/sys/mako.h index 5a58a54..f1308cf 100644 --- a/src/sys/mako.h +++ b/src/sys/mako.h @@ -98,7 +98,7 @@ private: PLAY play[9]; bool mute_flag; float play_time; - DWORD prev_time; + Uint32 prev_time; public: MAKO(NACT* parent); diff --git a/src/sys/mako_midi.cpp b/src/sys/mako_midi.cpp index 170a521..d2fe1c5 100644 --- a/src/sys/mako_midi.cpp +++ b/src/sys/mako_midi.cpp @@ -92,7 +92,7 @@ void MAKO::start_midi() midiOutPrepareHeader(hMidi, &mhMidi, sizeof(mhMidi)); midiOutLongMsg(hMidi, &mhMidi, sizeof(mhMidi)); while(!(mhMidi.dwFlags & MHDR_DONE)) { - Sleep(10); + SDL_Delay(10); } midiOutUnprepareHeader(hMidi, &mhMidi, sizeof(mhMidi)); @@ -123,14 +123,14 @@ void MAKO::start_midi() } // タイマーリセット - prev_time = timeGetTime(); + prev_time = SDL_GetTicks(); play_time = 0; } void MAKO::play_midi() { // 経過時間の取得 - DWORD current_time = timeGetTime(); + Uint32 current_time = SDL_GetTicks(); if(current_time > prev_time) { play_time += (float)(current_time - prev_time); prev_time = current_time; diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp index 4193f32..87c5220 100644 --- a/src/sys/nact.cpp +++ b/src/sys/nact.cpp @@ -85,7 +85,7 @@ NACT::NACT() // コマンド初期化 column = true; // 座標モード wait_keydown = true; // ウェイト時のキー受付 - seed = timeGetTime(); // 乱数の種 + seed = SDL_GetTicks(); // 乱数の種 text_wait_time = 100; // メッセージ表示のウェイト text_wait_enb = false; text_skip_enb = false; @@ -172,9 +172,9 @@ int NACT::thread(void* pvoid) pparams->nact->execute(); // 512コマンド実行毎にSleep(10) if(!(sleep_cnt = (sleep_cnt + 1) & 0x1ff)) { - Sleep(10); + SDL_Delay(10); } else { - Sleep(0); + SDL_Delay(0); } } return 0; @@ -341,7 +341,7 @@ void NACT::execute() #endif if(!ags->draw_menu && text_wait_enb && cmd != 0x20) { - DWORD dwTime = timeGetTime() + text_wait_time; + Uint32 dwTime = SDL_GetTicks() + text_wait_time; for(;;) { if(params.terminate) { return; @@ -350,10 +350,10 @@ void NACT::execute() if(RND && wait_keydown) { break; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -374,7 +374,7 @@ void NACT::execute() #endif if(!ags->draw_menu && text_wait_enb) { - DWORD dwTime = timeGetTime() + text_wait_time; + Uint32 dwTime = SDL_GetTicks() + text_wait_time; for(;;) { if(params.terminate) { return; @@ -383,10 +383,10 @@ void NACT::execute() if(RND && wait_keydown) { break; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(10); + SDL_Delay(10); } } diff --git a/src/sys/nact_sys1.cpp b/src/sys/nact_sys1.cpp index 1e0e1bf..66f7eda 100644 --- a/src/sys/nact_sys1.cpp +++ b/src/sys/nact_sys1.cpp @@ -26,21 +26,21 @@ #define WAIT(tm) \ { \ - DWORD dwTime = timeGetTime() + (tm); \ + Uint32 dwTime = SDL_GetTicks() + (tm); \ for(;;) { \ if(params.terminate) { \ return; \ } \ - if(dwTime <= timeGetTime()) { \ + if(dwTime <= SDL_GetTicks()) { \ break; \ } \ - Sleep(10); \ + SDL_Delay(10); \ } \ } #define WAIT_KEYQUIT(tm) \ { \ - DWORD dwTime = timeGetTime() + (tm); \ + Uint32 dwTime = SDL_GetTicks() + (tm); \ for(;;) { \ if(params.terminate) { \ return; \ @@ -53,17 +53,17 @@ if(!get_key()) { \ break; \ } \ - if(dwTime <= timeGetTime()) { \ + if(dwTime <= SDL_GetTicks()) { \ break; \ } \ - Sleep(10); \ + SDL_Delay(10); \ } \ break; \ } \ - if(dwTime <= timeGetTime()) { \ + if(dwTime <= SDL_GetTicks()) { \ break; \ } \ - Sleep(10); \ + SDL_Delay(10); \ } \ } @@ -345,7 +345,7 @@ void NACT::cmd_open_menu() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -370,14 +370,14 @@ void NACT::cmd_open_menu() return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -387,7 +387,7 @@ void NACT::cmd_open_menu() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -549,7 +549,7 @@ top2: if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -574,14 +574,14 @@ top2: return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -591,7 +591,7 @@ top2: if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -737,7 +737,7 @@ top2: if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -762,14 +762,14 @@ top2: return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -779,7 +779,7 @@ top2: if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -847,9 +847,9 @@ void NACT::cmd_a() if(get_key()) { break; } - Sleep(10); + SDL_Delay(10); } - Sleep(100); + SDL_Delay(100); for(;;) { if(params.terminate) { return; @@ -857,7 +857,7 @@ void NACT::cmd_a() if(!(get_key() & 0x18)) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -1390,9 +1390,9 @@ void NACT::cmd_y() if(get_key()) { break; } - Sleep(10); + SDL_Delay(10); } - Sleep(100); + SDL_Delay(100); for(;;) { if(params.terminate) { return; @@ -1400,7 +1400,7 @@ void NACT::cmd_y() if(!(get_key() & 0x18)) { break; } - Sleep(10); + SDL_Delay(10); } ags->clear_text_window(text_window, true); break; diff --git a/src/sys/nact_sys2.cpp b/src/sys/nact_sys2.cpp index 751c9d9..a2d0873 100644 --- a/src/sys/nact_sys2.cpp +++ b/src/sys/nact_sys2.cpp @@ -14,21 +14,21 @@ #define WAIT(tm) \ { \ - DWORD dwTime = timeGetTime() + (tm); \ + Uint32 dwTime = SDL_GetTicks() + (tm); \ for(;;) { \ if(params.terminate) { \ return; \ } \ - if(dwTime <= timeGetTime()) { \ + if(dwTime <= SDL_GetTicks()) { \ break; \ } \ - Sleep(10); \ + SDL_Delay(10); \ } \ } #define WAIT_KEYQUIT(tm) \ { \ - DWORD dwTime = timeGetTime() + (tm); \ + Uint32 dwTime = SDL_GetTicks() + (tm); \ for(;;) { \ if(params.terminate) { \ return; \ @@ -41,17 +41,17 @@ if(!get_key()) { \ break; \ } \ - if(dwTime <= timeGetTime()) { \ + if(dwTime <= SDL_GetTicks()) { \ break; \ } \ - Sleep(10); \ + SDL_Delay(10); \ } \ break; \ } \ - if(dwTime <= timeGetTime()) { \ + if(dwTime <= SDL_GetTicks()) { \ break; \ } \ - Sleep(10); \ + SDL_Delay(10); \ } \ } @@ -370,7 +370,7 @@ void NACT::cmd_open_menu() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -395,14 +395,14 @@ void NACT::cmd_open_menu() return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -412,7 +412,7 @@ void NACT::cmd_open_menu() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -539,7 +539,7 @@ void NACT::cmd_open_verb() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -564,14 +564,14 @@ void NACT::cmd_open_verb() return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -581,7 +581,7 @@ void NACT::cmd_open_verb() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -683,7 +683,7 @@ void NACT::cmd_open_obj(int verb) if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -708,14 +708,14 @@ void NACT::cmd_open_obj(int verb) return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -725,7 +725,7 @@ void NACT::cmd_open_obj(int verb) if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -791,9 +791,9 @@ void NACT::cmd_a() if(get_key()) { break; } - Sleep(10); + SDL_Delay(10); } - Sleep(100); + SDL_Delay(100); for(;;) { if(params.terminate) { return; @@ -801,7 +801,7 @@ void NACT::cmd_a() if(!(get_key() & 0x18)) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -1434,7 +1434,7 @@ void NACT::cmd_y() break; case 3: { - DWORD dwTime = timeGetTime() + param * 1000 / 60; + Uint32 dwTime = SDL_GetTicks() + param * 1000 / 60; for(;;) { if(params.terminate) { return; @@ -1443,10 +1443,10 @@ void NACT::cmd_y() // if(RND && wait_keydown) { // break; // } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(10); + SDL_Delay(10); } } break; @@ -1473,7 +1473,7 @@ void NACT::cmd_y() case 40: case 42: { - DWORD dwStart = timeGetTime(); + Uint32 dwStart = SDL_GetTicks(); for(int i = 0; i < 16; i++) { ags->fade_in(i); DWORD dwTime = dwStart + param * 1000 / 60 * i; @@ -1481,10 +1481,10 @@ void NACT::cmd_y() if(params.terminate) { return; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(0); + SDL_Delay(0); } } } @@ -1492,7 +1492,7 @@ void NACT::cmd_y() case 41: case 43: { - DWORD dwStart = timeGetTime(); + Uint32 dwStart = SDL_GetTicks(); for(int i = 0; i < 16; i++) { ags->fade_out(i, (cmd == 41) ? false : true); DWORD dwTime = dwStart + param * 1000 / 60 * i; @@ -1500,10 +1500,10 @@ void NACT::cmd_y() if(params.terminate) { return; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(0); + SDL_Delay(0); } } } diff --git a/src/sys/nact_sys3.cpp b/src/sys/nact_sys3.cpp index c5b39ee..0186e14 100644 --- a/src/sys/nact_sys3.cpp +++ b/src/sys/nact_sys3.cpp @@ -184,7 +184,7 @@ void NACT::cmd_open_menu() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -209,14 +209,14 @@ void NACT::cmd_open_menu() return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -226,7 +226,7 @@ void NACT::cmd_open_menu() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -353,7 +353,7 @@ void NACT::cmd_open_verb() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -378,14 +378,14 @@ void NACT::cmd_open_verb() return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -395,7 +395,7 @@ void NACT::cmd_open_verb() if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -497,7 +497,7 @@ void NACT::cmd_open_obj(int verb) if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } // メニュー表示 @@ -522,14 +522,14 @@ void NACT::cmd_open_obj(int verb) return; } if(val = get_key()) { - Sleep(100); + SDL_Delay(100); break; } get_cursor(¤t_mx, ¤t_my); if(abs(my - current_my) > 3) { break; } - Sleep(10); + SDL_Delay(10); } if(val) { for(;;) { @@ -539,7 +539,7 @@ void NACT::cmd_open_obj(int verb) if(!get_key()) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -605,9 +605,9 @@ void NACT::cmd_a() if(get_key()) { break; } - Sleep(10); + SDL_Delay(10); } - Sleep(100); + SDL_Delay(100); for(;;) { if(params.terminate) { return; @@ -615,7 +615,7 @@ void NACT::cmd_a() if(!(get_key() & 0x18)) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -888,7 +888,7 @@ void NACT::cmd_k() return; } } - Sleep(10); + SDL_Delay(10); } if(cmd != 0 && cmd != 4) { RND = val; @@ -896,7 +896,7 @@ void NACT::cmd_k() // キーが離されるまで待機 if(cmd != 1) { - Sleep(100); + SDL_Delay(100); for(;;) { if(params.terminate) { return; @@ -904,7 +904,7 @@ void NACT::cmd_k() if(!(val = get_key())) { break; } - Sleep(10); + SDL_Delay(10); } } @@ -1468,7 +1468,7 @@ void NACT::cmd_y() } else if(param == 10001) { wait_keydown = true; } else { - DWORD dwTime = timeGetTime() + param * 1000 / 60; + Uint32 dwTime = SDL_GetTicks() + param * 1000 / 60; for(;;) { if(params.terminate) { return; @@ -1477,10 +1477,10 @@ void NACT::cmd_y() if(RND && wait_keydown) { break; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(10); + SDL_Delay(10); } } break; @@ -1568,7 +1568,7 @@ void NACT::cmd_y() case 40: case 42: if(ags->now_fade()) { - DWORD dwStart = timeGetTime(); + Uint32 dwStart = SDL_GetTicks(); for(int i = 0; i < 16; i++) { ags->fade_in(i); DWORD dwTime = dwStart + param * 1000 / 60 * i; @@ -1576,10 +1576,10 @@ void NACT::cmd_y() if(params.terminate) { return; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(0); + SDL_Delay(0); } } ags->fade_end(); @@ -1589,7 +1589,7 @@ void NACT::cmd_y() case 43: if(!ags->now_fade()) { ags->fade_start(); - DWORD dwStart = timeGetTime(); + Uint32 dwStart = SDL_GetTicks(); for(int i = 0; i < 16; i++) { ags->fade_out(i, (cmd == 41) ? false : true); DWORD dwTime = dwStart + param * 1000 / 60 * i; @@ -1597,10 +1597,10 @@ void NACT::cmd_y() if(params.terminate) { return; } - if(dwTime <= timeGetTime()) { + if(dwTime <= SDL_GetTicks()) { break; } - Sleep(0); + SDL_Delay(0); } } } @@ -1639,7 +1639,7 @@ void NACT::cmd_y() if(!get_key()) { break; } - Sleep(0); + SDL_Delay(0); } } } else if(param == 3) {