menu: improve grouping in spell practice and stage select

taisei-project · Jun 14, 2024 · 0fe4655 · 0fe4655
1 parent bad453c
commit 0fe4655
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/menu/spellpractice.c b/src/menu/spellpractice.c
@@ -23,6 +23,7 @@ static void draw_spell_menu(MenuData *m) {
 MenuData* create_spell_menu(void) {
 	char title[128];
 	Difficulty lastdiff = D_Any;
+	uint16_t lastgroup = 0;
 
 	MenuData *m = alloc_menu();
 
@@ -32,14 +33,17 @@ MenuData* create_spell_menu(void) {
 	m->transition = TransFadeBlack;
 
 	int n = stageinfo_get_num_stages();
+
 	for(int i = 0; i < n; ++i) {
 		StageInfo *stg = stageinfo_get_by_index(i);
 
 		if(stg->type != STAGE_SPELL) {
 			continue;
 		}
 
-		if(stg->difficulty < lastdiff || (stg->difficulty == D_Extra && lastdiff != D_Extra)) {
+		uint16_t group = stg->id & ~0xff;
+
+		if(i && (lastgroup != group || stg->difficulty < lastdiff)) {
 			add_menu_separator(m);
 		}
 
@@ -54,6 +58,7 @@ MenuData* create_spell_menu(void) {
 		}
 
 		lastdiff = stg->difficulty;
+		lastgroup = group;
 	}
 
 	add_menu_separator(m);

diff --git a/src/menu/stageselect.c b/src/menu/stageselect.c
@@ -24,6 +24,7 @@ static void draw_stage_menu(MenuData *m) {
 MenuData* create_stage_menu(void) {
 	char title[STGMENU_MAX_TITLE_LENGTH];
 	Difficulty lastdiff = D_Any;
+	uint16_t lastgroup = 0;
 
 	MenuData *m = alloc_menu();
 
@@ -36,15 +37,17 @@ MenuData* create_stage_menu(void) {
 	for(int i = 0; i < n; ++i) {
 		StageInfo *stg = stageinfo_get_by_index(i);
 		Difficulty diff = stg->difficulty;
+		uint16_t group = stg->id & ~0xff;
 
-		if(diff < lastdiff || (diff == D_Extra && lastdiff != D_Extra) || (diff && !lastdiff)) {
+		if(i && (lastgroup != group || diff < lastdiff)) {
 			add_menu_separator(m);
 		}
 
 		snprintf(title, STGMENU_MAX_TITLE_LENGTH, "%s: %s", stg->title, stg->subtitle);
 		add_menu_entry(m, title, start_game, stg);
 
 		lastdiff = diff;
+		lastgroup = group;
 	}
 
 	add_menu_separator(m);