Removed the Stage display

Removed the STAGE display. Added " / <total>" to the Region and Level displays. Closes #333.
olofson · Jan 23, 2017 · 68662ba · 68662ba
1 parent 458f757
commit 68662ba
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 22 deletions.
diff --git a/data/gfx/mono/main.theme b/data/gfx/mono/main.theme
@@ -37,9 +37,8 @@ set D_DASH_RIGHTLEDS	479	12	5	336
 // Positions of elements inside D_DASH_CONSOLE
 set D_DASH_HIGH		0	8	104	18	D_DASH_CONSOLE
 set D_DASH_SCORE	0	32	104	18	D_DASH_CONSOLE
-set D_DASH_STAGE	0	88	104	18	D_DASH_CONSOLE
-set D_DASH_REGION	0	112	104	18	D_DASH_CONSOLE
-set D_DASH_LEVEL	0	136	104	18	D_DASH_CONSOLE
+set D_DASH_REGION	0	88	104	18	D_DASH_CONSOLE
+set D_DASH_LEVEL	0	112	104	18	D_DASH_CONSOLE
 
 
 //-----------------------------------------------------------------------------

diff --git a/src/dashboard.cpp b/src/dashboard.cpp
@@ -129,7 +129,6 @@ void dashboard_window_t::mode(dashboard_modes_t m)
 	wradar->visible(main);
 	dhigh->visible(score);
 	dscore->visible(score);
-	dstage->visible(ingame);
 	dregion->visible(ingame);
 	dlevel->visible(ingame);
 	pxtop->visible(main);

diff --git a/src/graphics.h b/src/graphics.h
@@ -230,7 +230,6 @@ enum KOBO_LogoEffects
 	KOBO_DEFS(DASH_RIGHTLEDS)	\
 	KOBO_DEFS(DASH_HIGH)		\
 	KOBO_DEFS(DASH_SCORE)		\
-	KOBO_DEFS(DASH_STAGE)		\
 	KOBO_DEFS(DASH_REGION)		\
 	KOBO_DEFS(DASH_LEVEL)		\
 	KOBO_DEFS(SOUNDTOOLS_HOTKEYS)	\

diff --git a/src/kobo.cpp b/src/kobo.cpp
@@ -94,7 +94,6 @@ window_t		*woverlay = NULL;
 
 display_t		*dhigh = NULL;
 display_t		*dscore = NULL;
-display_t		*dstage = NULL;
 display_t		*dregion = NULL;
 display_t		*dlevel = NULL;
 hledbar_t		*pxtop = NULL;
@@ -582,20 +581,15 @@ void KOBO_main::init_dash_layout()
 	dscore->caption("SCORE");
 	dscore->text("000000000");
 
-	place(dstage, KOBO_D_DASH_STAGE);
-	dstage->font(B_NORMAL_FONT);
-	dstage->caption("STAGE");
-	dstage->text("000");
-
 	place(dregion, KOBO_D_DASH_REGION);
 	dregion->font(B_NORMAL_FONT);
 	dregion->caption("REGION");
-	dregion->text("0");
+	dregion->text("-");
 
 	place(dlevel, KOBO_D_DASH_LEVEL);
 	dlevel->font(B_NORMAL_FONT);
 	dlevel->caption("LEVEL");
-	dlevel->text("00");
+	dlevel->text("-");
 
 	// Ship health bar
 	place(whealth, KOBO_D_DASH_HEALTH);
@@ -809,7 +803,6 @@ int KOBO_main::init_display(prefs_t *p)
 	dscore = new display_t(gengine);
 	wmap = new KOBO_radar_map(gengine);
 	wradar = new KOBO_radar_window(gengine);
-	dstage = new display_t(gengine);
 	dregion = new display_t(gengine);
 	dlevel = new display_t(gengine);
 	pxtop = new hledbar_t(gengine);
@@ -835,7 +828,6 @@ void KOBO_main::close_display()
 	delete pxtop;		pxtop = NULL;
 	delete dlevel;		dlevel = NULL;
 	delete dregion;		dregion = NULL;
-	delete dstage;		dstage = NULL;
 	delete wradar;		wradar = NULL;
 	delete wmap;		wmap = NULL;
 	delete dscore;		dscore = NULL;

diff --git a/src/kobo.h b/src/kobo.h
@@ -253,7 +253,6 @@ extern window_t			*woverlay;
 
 extern display_t		*dhigh;
 extern display_t		*dscore;
-extern display_t		*dstage;
 extern display_t		*dregion;
 extern display_t		*dlevel;
 extern hledbar_t		*pxtop;

diff --git a/src/manage.cpp b/src/manage.cpp
@@ -417,15 +417,13 @@ void _manage::put_info()
 	dhigh->text(s);
 	dhigh->on();
 
-	snprintf(s, 16, "%d", selected_stage);
-	dstage->text(s);
-	dstage->on();
-
-	snprintf(s, 16, "%d", (selected_stage - 1) / 10 % 5 + 1);
+	snprintf(s, 16, "%d / %d", (selected_stage - 1) / 10 % 5 + 1,
+			KOBO_REGIONS);
 	dregion->text(s);
 	dregion->on();
 
-	snprintf(s, 16, "%d", (selected_stage - 1) % 10 + 1);
+	snprintf(s, 16, "%d / %d", (selected_stage - 1) % 10 + 1,
+			KOBO_LEVELS_PER_REGION);
 	dlevel->text(s);
 	dlevel->on();