From 46827f35ef0669ca605ff523aa10a7ca328b6c9f Mon Sep 17 00:00:00 2001
From: kichikuou <KichikuouChrome@gmail.com>
Date: Thu, 24 Dec 2020 22:55:03 +0900
Subject: [PATCH] Use common menu selection function in all systems

---
 src/sys/nact.cpp      |  88 ++++++++++++++
 src/sys/nact.h        |   3 +-
 src/sys/nact_sys1.cpp | 268 +++---------------------------------------
 src/sys/nact_sys2.cpp | 264 +++--------------------------------------
 src/sys/nact_sys3.cpp |  88 --------------
 5 files changed, 121 insertions(+), 590 deletions(-)

diff --git a/src/sys/nact.cpp b/src/sys/nact.cpp
index b60b8b2..ac4d28f 100644
--- a/src/sys/nact.cpp
+++ b/src/sys/nact.cpp
@@ -354,6 +354,94 @@ void NACT::load_scenario(int page)
 
 // 下位関数
 
+int NACT::menu_select(int num_items)
+{
+	// メニュー表示
+	ags->open_menu_window(menu_window);
+
+	// マウス移動
+	int sx = ags->menu_w[menu_window - 1].sx;
+	int sy = ags->menu_w[menu_window - 1].sy;
+	int ex = ags->menu_w[menu_window - 1].ex;
+	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;;) {
+		// 入力待機
+		int val = 0, current_mx = mx, current_my = my;
+		for(;;) {
+			if(terminate) {
+				return -1;
+			}
+			get_cursor(&current_mx, &current_my);
+			int dx = mx - current_mx;
+			int dy = my - current_my;
+			if (dx*dx + dy*dy > 10)
+				break;
+			if((val = get_key()) != 0) {
+				sys_sleep(100);
+				break;
+			}
+			sys_sleep(16);
+		}
+		if(val) {
+			for(;;) {
+				if(terminate) {
+					return -1;
+				}
+				if(!get_key()) {
+					break;
+				}
+				sys_sleep(16);
+			}
+		}
+
+		if(val == 0) {
+			// マウス操作
+			mx = current_mx; my = current_my;
+			int index = (my - sy) / height;
+			if(sx <= mx && mx <= ex && 0 <= index && index < num_items) {
+				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) {
+				current_index = current_index ? current_index - 1 : num_items - 1;
+			} else if(val == 2) {
+				current_index = (current_index < num_items - 1) ? current_index + 1 : 0;
+			} else if(val == 4) {
+				current_index = 0;
+			} else if(val == 8) {
+				current_index = num_items - 1;
+			}
+			ags->redraw_menu_window(menu_window, current_index);
+			selectable = true;
+		} else if(val == 16 && selectable) {
+			break;
+		} else if(val == 32) {
+			current_index = -1;
+			break;
+		}
+	}
+
+	// 画面更新
+	ags->close_menu_window(menu_window);
+	if(clear_text) {
+		ags->clear_text_window(text_window, true);
+	}
+
+	return current_index;
+}
+
 uint16 NACT::random(uint16 range)
 {
 	// xorshift32
diff --git a/src/sys/nact.h b/src/sys/nact.h
index 070f764..c105277 100644
--- a/src/sys/nact.h
+++ b/src/sys/nact.h
@@ -216,6 +216,7 @@ protected:
 	uint16 random(uint16 range);
 	uint32 seed;
 
+	int menu_select(int num_items);
 	void wait_after_open_menu();
 
 	void sys_sleep(int ms);
@@ -415,8 +416,6 @@ protected:
 	void cmd_z() override;
 	uint16 cali() override;
 	uint16 cali2() override;
-private:
-	int menu_select(int num_items);
 };
 
 #endif // _NACT_H_
diff --git a/src/sys/nact_sys1.cpp b/src/sys/nact_sys1.cpp
index 22f3d6e..9eb2565 100644
--- a/src/sys/nact_sys1.cpp
+++ b/src/sys/nact_sys1.cpp
@@ -323,90 +323,12 @@ void NACT_Sys1::cmd_open_menu()
 		}
 	}
 
-	// メニュー表示
-	ags->open_menu_window(menu_window);
+	int selection = menu_select(menu_index);
+	if (terminate)
+		return;
 
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return;
-			}
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			get_cursor(&current_mx, &current_my);
-			if(abs(my - current_my) > 3) {
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int index = (my - sy) / height;
-			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) {
-				current_index = current_index ? current_index - 1 : menu_index - 1;
-			} else if(val == 2) {
-				current_index = (current_index < menu_index - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = menu_index - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	if(current_index != -1) {
-		scenario_addr = menu_addr[current_index];
+	if (selection != -1) {
+		scenario_addr = menu_addr[selection];
 	}
 	menu_index = 0;
 }
@@ -509,94 +431,16 @@ top2:
 	}
 	ags->draw_menu = false;
 
-	// メニュー表示
-	ags->open_menu_window(menu_window);
+	int selection = menu_select(index);
+	if (terminate)
+		return;
 
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return;
-			}
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			get_cursor(&current_mx, &current_my);
-			if(abs(my - current_my) > 3) {
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int mindex = (my - sy) / height;
-			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) {
-				current_index = current_index ? current_index - 1 : index - 1;
-			} else if(val == 2) {
-				current_index = (current_index < index - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = index - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	if(current_index == -1) {
+	if(selection == -1) {
 		scenario_addr = scenario_data[0] | (scenario_data[1] << 8);
-	} else if(id[current_index] == -1) {
+	} else if(id[selection] == -1) {
 		goto top;
 	} else {
-		cmd_open_obj(id[current_index]);
+		cmd_open_obj(id[selection]);
 	}
 	menu_index = 0;
 }
@@ -691,94 +535,16 @@ top2:
 	}
 	ags->draw_menu = false;
 
-	// メニュー表示
-	ags->open_menu_window(menu_window);
+	int selection = menu_select(index);
+	if (terminate)
+		return;
 
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return;
-			}
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			get_cursor(&current_mx, &current_my);
-			if(abs(my - current_my) > 3) {
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int mindex = (my - sy) / height;
-			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) {
-				current_index = current_index ? current_index - 1 : index - 1;
-			} else if(val == 2) {
-				current_index = (current_index < index - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = index - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	if(current_index == -1) {
+	if(selection == -1) {
 		scenario_addr = scenario_data[0] | (scenario_data[1] << 8);
-	} else if(id[current_index] == -1) {
+	} else if(id[selection] == -1) {
 		goto top;
 	} else {
-		scenario_addr = addr[id[current_index]];
+		scenario_addr = addr[id[selection]];
 	}
 }
 
diff --git a/src/sys/nact_sys2.cpp b/src/sys/nact_sys2.cpp
index 5c76a3e..38a59c9 100644
--- a/src/sys/nact_sys2.cpp
+++ b/src/sys/nact_sys2.cpp
@@ -368,90 +368,12 @@ void NACT_Sys2::cmd_open_menu()
 		return;
 	}
 
-	// メニュー表示
-	ags->open_menu_window(menu_window);
+	int selection = menu_select(menu_index);
+	if (terminate)
+		return;
 
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return;
-			}
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			get_cursor(&current_mx, &current_my);
-			if(abs(my - current_my) > 3) {
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int index = (my - sy) / height;
-			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) {
-				current_index = current_index ? current_index - 1 : menu_index - 1;
-			} else if(val == 2) {
-				current_index = (current_index < menu_index - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = menu_index - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	if(current_index != -1) {
-		scenario_addr = menu_addr[current_index];
+	if (selection != -1) {
+		scenario_addr = menu_addr[selection];
 	}
 	menu_index = 0;
 }
@@ -519,92 +441,14 @@ void NACT_Sys2::cmd_open_verb()
 	}
 	ags->draw_menu = false;
 
-	// メニュー表示
-	ags->open_menu_window(menu_window);
+	int selection = menu_select(index);
+	if (terminate)
+		return;
 
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return;
-			}
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			get_cursor(&current_mx, &current_my);
-			if(abs(my - current_my) > 3) {
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int mindex = (my - sy) / height;
-			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) {
-				current_index = current_index ? current_index - 1 : index - 1;
-			} else if(val == 2) {
-				current_index = (current_index < index - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = index - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	if(current_index == -1) {
+	if(selection == -1) {
 		scenario_addr = scenario_data[0] | (scenario_data[1] << 8);
 	} else {
-		cmd_open_obj(id[current_index]);
+		cmd_open_obj(id[selection]);
 	}
 	menu_index = 0;
 }
@@ -657,92 +501,14 @@ void NACT_Sys2::cmd_open_obj(int verb)
 	ags->menu_dest_y += ags->menu_font_size + 2;
 	ags->draw_menu = false;
 
-	// メニュー表示
-	ags->open_menu_window(menu_window);
+	int selection = menu_select(index);
+	if (terminate)
+		return;
 
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return;
-			}
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			get_cursor(&current_mx, &current_my);
-			if(abs(my - current_my) > 3) {
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int mindex = (my - sy) / height;
-			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) {
-				current_index = current_index ? current_index - 1 : index - 1;
-			} else if(val == 2) {
-				current_index = (current_index < index - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = index - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	if(current_index == -1) {
+	if(selection == -1) {
 		scenario_addr = scenario_data[0] | (scenario_data[1] << 8);
 	} else {
-		scenario_addr = addr[id[current_index]];
+		scenario_addr = addr[id[selection]];
 	}
 }
 
diff --git a/src/sys/nact_sys3.cpp b/src/sys/nact_sys3.cpp
index 82158e9..63c7866 100644
--- a/src/sys/nact_sys3.cpp
+++ b/src/sys/nact_sys3.cpp
@@ -127,94 +127,6 @@ void NACT_Sys3::cmd_set_menu()
 	}
 }
 
-int NACT_Sys3::menu_select(int num_items)
-{
-	// メニュー表示
-	ags->open_menu_window(menu_window);
-
-	// マウス移動
-	int sx = ags->menu_w[menu_window - 1].sx;
-	int sy = ags->menu_w[menu_window - 1].sy;
-	int ex = ags->menu_w[menu_window - 1].ex;
-	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;;) {
-		// 入力待機
-		int val = 0, current_mx = mx, current_my = my;
-		for(;;) {
-			if(terminate) {
-				return -1;
-			}
-			get_cursor(&current_mx, &current_my);
-			int dx = mx - current_mx;
-			int dy = my - current_my;
-			if (dx*dx + dy*dy > 10)
-				break;
-			if((val = get_key()) != 0) {
-				sys_sleep(100);
-				break;
-			}
-			sys_sleep(16);
-		}
-		if(val) {
-			for(;;) {
-				if(terminate) {
-					return -1;
-				}
-				if(!get_key()) {
-					break;
-				}
-				sys_sleep(16);
-			}
-		}
-
-		if(val == 0) {
-			// マウス操作
-			mx = current_mx; my = current_my;
-			int index = (my - sy) / height;
-			if(sx <= mx && mx <= ex && 0 <= index && index < num_items) {
-				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) {
-				current_index = current_index ? current_index - 1 : num_items - 1;
-			} else if(val == 2) {
-				current_index = (current_index < num_items - 1) ? current_index + 1 : 0;
-			} else if(val == 4) {
-				current_index = 0;
-			} else if(val == 8) {
-				current_index = num_items - 1;
-			}
-			ags->redraw_menu_window(menu_window, current_index);
-			selectable = true;
-		} else if(val == 16 && selectable) {
-			break;
-		} else if(val == 32) {
-			current_index = -1;
-			break;
-		}
-	}
-
-	// 画面更新
-	ags->close_menu_window(menu_window);
-	if(clear_text) {
-		ags->clear_text_window(text_window, true);
-	}
-
-	return current_index;
-}
-
 void NACT_Sys3::cmd_open_menu()
 {
 	output_console("\n]");