Use SDL timing functions

This commit is contained in:
kichikuou
2016-03-27 19:38:45 +09:00
parent 3de2dad0d4
commit 1ca785f418
7 changed files with 101 additions and 101 deletions
+28 -28
View File
@@ -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(&current_mx, &current_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(&current_mx, &current_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(&current_mx, &current_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) {