Max/kichikuou_system3-sdl2
1
0
Fork 0
mirror of https://github.com/kichikuou/system3-sdl2.git synced 2026-10-03 20:38:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge upstream changes: Add wait after opening menu

Browse Source 
This prevents mis-selection by key repeat etc.
This commit is contained in:
kichikuou
2020-05-23 10:53:34 +09:00
parent cda1888ebc
commit 5571061ac1
5 changed files with 62 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys2.cpp
+12 -42
View File
@@ -333,21 +333,8 @@ void NACT_Sys2::cmd_open_menu()
return;
}
// クリック中の間は待機
for(;;) {
if(terminate) {
return;
}
// if(get_key() != 32) {
if(!get_key()) {
break;
}
SDL_Delay(10);
}
// メニュー表示
ags->open_menu_window(menu_window);
int current_index = 0;
// マウス移動
int sx = ags->menu_w[menu_window - 1].sx;
@@ -356,7 +343,10 @@ void NACT_Sys2::cmd_open_menu()
int mx = ex - 16;
int my = sy + 10;
int height = ags->menu_font_size + 4;
int current_index = 0;
set_cursor(mx, my);
wait_after_open_menu();
// メニュー選択
for(bool selectable = true;;) {
@@ -366,7 +356,7 @@ void NACT_Sys2::cmd_open_menu()
if(terminate) {
return;
}
if((val = get_key())) {
if((val = get_key()) != 0) {
SDL_Delay(100);
break;
}
@@ -494,21 +484,8 @@ void NACT_Sys2::cmd_open_verb()
}
ags->draw_menu = false;
// クリック中の間は待機
for(;;) {
if(terminate) {
return;
}
// if(get_key() != 32) {
if(!get_key()) {
break;
}
SDL_Delay(10);
}
// メニュー表示
ags->open_menu_window(menu_window);
int current_index = 0;
// マウス移動
int sx = ags->menu_w[menu_window - 1].sx;
@@ -517,7 +494,10 @@ void NACT_Sys2::cmd_open_verb()
int mx = ex - 16;
int my = sy + 10;
int height = ags->menu_font_size + 4;
int current_index = 0;
set_cursor(mx, my);
wait_after_open_menu();
// メニュー選択
for(bool selectable = true;;) {
@@ -527,7 +507,7 @@ void NACT_Sys2::cmd_open_verb()
if(terminate) {
return;
}
if((val = get_key())) {
if((val = get_key()) != 0) {
SDL_Delay(100);
break;
}
@@ -642,21 +622,8 @@ void NACT_Sys2::cmd_open_obj(int verb)
ags->menu_dest_y += ags->menu_font_size + 2;
ags->draw_menu = false;
// クリック中の間は待機
for(;;) {
if(terminate) {
return;
}
// if(get_key() != 32) {
if(!get_key()) {
break;
}
SDL_Delay(10);
}
// メニュー表示
ags->open_menu_window(menu_window);
int current_index = 0;
// マウス移動
int sx = ags->menu_w[menu_window - 1].sx;
@@ -665,7 +632,10 @@ void NACT_Sys2::cmd_open_obj(int verb)
int mx = ex - 16;
int my = sy + 10;
int height = ags->menu_font_size + 4;
int current_index = 0;
set_cursor(mx, my);
wait_after_open_menu();
// メニュー選択
for(bool selectable = true;;) {
@@ -675,7 +645,7 @@ void NACT_Sys2::cmd_open_obj(int verb)
if(terminate) {
return;
}
if((val = get_key())) {
if((val = get_key()) != 0) {
SDL_Delay(100);
break;
}