From a2962713bc37899e5383eed46d5eaa4e6b33d57b Mon Sep 17 00:00:00 2001
From: Rezmason <jeremysachs@rezmason.net>
Date: Sun, 21 Feb 2021 20:40:50 -0800
Subject: [PATCH] Whoops, rearranging the stage regions.

---
 src/stage.h        | 18 +++++++++--------
 src/stageregions.c | 50 ++++++++++++++++++++++++----------------------
 2 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/stage.h b/src/stage.h
index d8323c5..895f02c 100644
--- a/src/stage.h
+++ b/src/stage.h
@@ -50,20 +50,14 @@ typedef struct {
 typedef enum {
 	BILLBOARD_NODE,
 	BILLBOARD_LAST_NODE_FADE,
-	BILLBOARD_VIGNETTE,
-	BILLBOARD_MENU_BLACK,
-	BILLBOARD_MENU_CREDIT1,
-	BILLBOARD_MENU_CREDIT2,
-	BILLBOARD_MENU_CREDIT3,
-	BILLBOARD_MENU_CREDIT4,
-	BILLBOARD_MENU_LOGO,
-	BILLBOARD_MENU_CONTROLS,
 
 	BILLBOARD_ENTENTE_SCREEN,
 	BILLBOARD_CLOCK,
 	BILLBOARD_CLOCK_SHADOW,
 	BILLBOARD_PROGRESS_PANE,
 
+	BILLBOARD_VIGNETTE,
+
 	BILLBOARD_HUD_FUSE,
 	BILLBOARD_HUD_FUSE_ALERT,
 	BILLBOARD_HUD_AUDIO,
@@ -78,6 +72,14 @@ typedef enum {
 	BILLBOARD_HUD_STEP_LEFT,
 	BILLBOARD_HUD_STEP_RIGHT,
 
+	BILLBOARD_MENU_BLACK,
+	BILLBOARD_MENU_CREDIT1,
+	BILLBOARD_MENU_CREDIT2,
+	BILLBOARD_MENU_CREDIT3,
+	BILLBOARD_MENU_CREDIT4,
+	BILLBOARD_MENU_LOGO,
+	BILLBOARD_MENU_CONTROLS,
+
 	BILLBOARD_SPLASH_TOP,
 	BILLBOARD_SPLASH_LEFT,
 	BILLBOARD_SPLASH_RIGHT,
diff --git a/src/stageregions.c b/src/stageregions.c
index 849b485..fc52673 100644
--- a/src/stageregions.c
+++ b/src/stageregions.c
@@ -45,30 +45,6 @@ Region regions[] =
 		/* BILLBOARD_LAST_NODE_FADE */
 		region(0., 0., 1., 1., LAYOUTMODE_STRETCH_NODE),
 
-		/* BILLBOARD_VIGNETTE */
-		region(0., 0., 1., 1., LAYOUTMODE_STRETCH),
-
-		/* BILLBOARD_MENU_BLACK */
-		region(0., 0., 1., 1., LAYOUTMODE_STRETCH),
-
-		/* BILLBOARD_MENU_CREDIT1 */
-		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
-
-		/* BILLBOARD_MENU_CREDIT2 */
-		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
-
-		/* BILLBOARD_MENU_CREDIT3 */
-		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
-
-		/* BILLBOARD_MENU_CREDIT4 */
-		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
-
-		/* BILLBOARD_MENU_LOGO */
-		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
-
-		/* BILLBOARD_MENU_CONTROLS */
-		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
-
 		/* BILLBOARD_ENTENTE_SCREEN */
 		region((0.5 - 0.03), (0.5 - 0.03 * ASPECT_RATIO), (0.03 * 2.), (0.03 * 2. * ASPECT_RATIO), LAYOUTMODE_STRETCH_NODE),
 
@@ -81,6 +57,9 @@ Region regions[] =
 		/* BILLBOARD_PROGRESS_PANE */
 		region((0.5 - 0.0738), (0.5 - (0.0738 + 0.015) * ASPECT_RATIO), (0.0738 * 2.), (0.0738 * 2. * ASPECT_RATIO), LAYOUTMODE_STRETCH_NODE),
 
+		/* BILLBOARD_VIGNETTE */
+		region(0., 0., 1., 1., LAYOUTMODE_STRETCH),
+
 		/* BILLBOARD_HUD_FUSE */
 		region(HUD_MARGIN + HUD_WIDTH * 0, HUD_Y, HUD_WIDTH, HUD_HEIGHT, LAYOUTMODE_CONTAIN),
 
@@ -117,10 +96,33 @@ Region regions[] =
 		/* BILLBOARD_HUD_STEP_RIGHT */
 		region(0.8, HUD_ALERT_Y, 0.2, HUD_HEIGHT, LAYOUTMODE_STRETCH),
 
+		/* BILLBOARD_MENU_BLACK */
+		region(0., 0., 1., 1., LAYOUTMODE_STRETCH),
+
+		/* BILLBOARD_MENU_CREDIT1 */
+		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
+
+		/* BILLBOARD_MENU_CREDIT2 */
+		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
+
+		/* BILLBOARD_MENU_CREDIT3 */
+		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
+
+		/* BILLBOARD_MENU_CREDIT4 */
+		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
+
+		/* BILLBOARD_MENU_LOGO */
+		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
+
+		/* BILLBOARD_MENU_CONTROLS */
+		region(0., 0., 1., 1., LAYOUTMODE_CONTAIN),
+
 		/* BILLBOARD_SPLASH_TOP */
 		region(0.2, 0.2, 0.6, 0.4, LAYOUTMODE_CONTAIN),
+
 		/* BILLBOARD_SPLASH_LEFT */
 		region(0.35, 0.7, 0.15, 0.3, LAYOUTMODE_CONTAIN),
+
 		/* BILLBOARD_SPLASH_RIGHT */
 		region(0.50, 0.7, 0.15, 0.3, LAYOUTMODE_CONTAIN),
 
-- 
2.34.2