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

Merge upstream changes: Prevent menu selection when cursor is out of window

Browse Source 
This was introduced in System3-sdl2 71728db only for nact_sys3. TOTO took
this change and expanded for nact_sys1 and nact_sys2 as well.
This commit is contained in:
kichikuou
2020-05-23 10:40:05 +09:00
parent 49b4ac4053
commit cda1888ebc
3 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sys/nact_sys1.cpp
+18 -6
View File
@@ -352,7 +352,7 @@ void NACT_Sys1::cmd_open_menu()
set_cursor(mx, my);
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {
@@ -388,6 +388,9 @@ void NACT_Sys1::cmd_open_menu()
if(sx <= mx && mx <= ex && 0 <= index && index < menu_index) {
current_index = index;
ags->redraw_menu_window(menu_window, current_index);
selectable = true;
} else {
selectable = false;
}
} else if(val == 1 || val == 2 || val == 4 || val == 8) {
if(val == 1) {
@@ -400,7 +403,8 @@ void NACT_Sys1::cmd_open_menu()
current_index = menu_index - 1;
}
ags->redraw_menu_window(menu_window, current_index);
} else if(val == 16) {
selectable = true;
} else if(val == 16 && selectable) {
break;
} else if(val == 32) {
current_index = -1;
@@ -544,7 +548,7 @@ top2:
set_cursor(mx, my);
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {
@@ -580,6 +584,9 @@ top2:
if(sx <= mx && mx <= ex && 0 <= mindex && mindex < index) {
current_index = mindex;
ags->redraw_menu_window(menu_window, current_index);
selectable = true;
} else {
selectable = false;
}
} else if(val == 1 || val == 2 || val == 4 || val == 8) {
if(val == 1) {
@@ -592,7 +599,8 @@ top2:
current_index = index - 1;
}
ags->redraw_menu_window(menu_window, current_index);
} else if(val == 16) {
selectable = true;
} else if(val == 16 && selectable) {
break;
} else if(val == 32) {
current_index = -1;
@@ -732,7 +740,7 @@ top2:
set_cursor(mx, my);
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {
@@ -768,6 +776,9 @@ top2:
if(sx <= mx && mx <= ex && 0 <= mindex && mindex < index) {
current_index = mindex;
ags->redraw_menu_window(menu_window, current_index);
selectable = true;
} else {
selectable = false;
}
} else if(val == 1 || val == 2 || val == 4 || val == 8) {
if(val == 1) {
@@ -780,7 +791,8 @@ top2:
current_index = index - 1;
}
ags->redraw_menu_window(menu_window, current_index);
} else if(val == 16) {
selectable = true;
} else if(val == 16 && selectable) {
break;
} else if(val == 32) {
current_index = -1;
src/sys/nact_sys2.cpp
+18 -6
View File
@@ -359,7 +359,7 @@ void NACT_Sys2::cmd_open_menu()
set_cursor(mx, my);
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {
@@ -395,6 +395,9 @@ void NACT_Sys2::cmd_open_menu()
if(sx <= mx && mx <= ex && 0 <= index && index < menu_index) {
current_index = index;
ags->redraw_menu_window(menu_window, current_index);
selectable = true;
} else {
selectable = false;
}
} else if(val == 1 || val == 2 || val == 4 || val == 8) {
if(val == 1) {
@@ -407,7 +410,8 @@ void NACT_Sys2::cmd_open_menu()
current_index = menu_index - 1;
}
ags->redraw_menu_window(menu_window, current_index);
} else if(val == 16) {
selectable = true;
} else if(val == 16 && selectable) {
break;
} else if(val == 32) {
current_index = -1;
@@ -516,7 +520,7 @@ void NACT_Sys2::cmd_open_verb()
set_cursor(mx, my);
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {
@@ -552,6 +556,9 @@ void NACT_Sys2::cmd_open_verb()
if(sx <= mx && mx <= ex && 0 <= mindex && mindex < index) {
current_index = mindex;
ags->redraw_menu_window(menu_window, current_index);
selectable = true;
} else {
selectable = false;
}
} else if(val == 1 || val == 2 || val == 4 || val == 8) {
if(val == 1) {
@@ -564,7 +571,8 @@ void NACT_Sys2::cmd_open_verb()
current_index = index - 1;
}
ags->redraw_menu_window(menu_window, current_index);
} else if(val == 16) {
selectable = true;
} else if(val == 16 && selectable) {
break;
} else if(val == 32) {
current_index = -1;
@@ -660,7 +668,7 @@ void NACT_Sys2::cmd_open_obj(int verb)
set_cursor(mx, my);
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {
@@ -696,6 +704,9 @@ void NACT_Sys2::cmd_open_obj(int verb)
if(sx <= mx && mx <= ex && 0 <= mindex && mindex < index) {
current_index = mindex;
ags->redraw_menu_window(menu_window, current_index);
selectable = true;
} else {
selectable = false;
}
} else if(val == 1 || val == 2 || val == 4 || val == 8) {
if(val == 1) {
@@ -708,7 +719,8 @@ void NACT_Sys2::cmd_open_obj(int verb)
current_index = index - 1;
}
ags->redraw_menu_window(menu_window, current_index);
} else if(val == 16) {
selectable = true;
} else if(val == 16 && selectable) {
break;
} else if(val == 32) {
current_index = -1;
src/sys/nact_sys3.cpp
+1 -3
View File
@@ -153,10 +153,8 @@ int NACT_Sys3::menu_select(int num_items)
int height = ags->menu_font_size + 4;
set_cursor(mx, my);
bool selectable = true;
// メニュー選択
for(;;) {
for(bool selectable = true;;) {
// 入力待機
int val = 0, current_mx = mx, current_my = my;
for(;;) {