Merge branch 'master' into outofbreathscreen

src/logic/gameend.rs

@@ -28,6 +28,9 @@ impl Screen for GameEndScreen {
         draw_handle.clear_background(Color::GRAY);
         // TODO: Maybe we can stick some art here?
 
+        // Render the background
+        draw_handle.draw_texture(&game_core.resources.shop_background, 0, 0, Color::WHITE);
+
         // Window dimensions
         let win_height = draw_handle.get_screen_height();
         let win_width = draw_handle.get_screen_width();

src/logic/loadingscreen.rs

@@ -89,10 +89,10 @@ impl LoadingScreen {
         let mask = self.get_logo_mask(playthrough_percent);
 
         // Create modified colors
-        let alpha_orange = Color {
+        let alpha_black = Color {
-            r: RUST_ORANGE.r,
+            r: 0,
-            g: RUST_ORANGE.g,
+            g: 0,
-            b: RUST_ORANGE.b,
+            b: 0,
             a: mask.a,
         };
 
@@ -102,7 +102,7 @@ impl LoadingScreen {
             win_height / 2 - 128,
             256,
             256,
-            alpha_orange,
+            alpha_black,
         );
         draw_handle.draw_rectangle(
             win_width / 2 - 112,
@@ -111,19 +111,19 @@ impl LoadingScreen {
             224,
             Color::WHITE,
         );
-        draw_handle.draw_text(
+        // draw_handle.draw_text(
-            "rust",
+        //     "rust",
-            win_width / 2 - 69,
+        //     win_width / 2 - 69,
-            win_height / 2 + 18,
+        //     win_height / 2 + 18,
-            50,
+        //     50,
-            alpha_orange,
+        //     alpha_orange,
-        );
+        // );
         draw_handle.draw_text(
             "raylib",
             win_width / 2 - 44,
             win_height / 2 + 48,
             50,
-            alpha_orange,
+            alpha_black,
         );
 
         // Move on to next logo if needed

src/logic/mainmenu.rs

@@ -28,8 +28,10 @@ impl Screen for MainMenuScreen {
         let win_height = draw_handle.get_screen_height();
         let win_width = draw_handle.get_screen_width();
 
-        // Clear frame
+        // // Clear frame
-        draw_handle.clear_background(Color::BLUE);
+        // draw_handle.clear_background(Color::BLUE);
+        // Render the background
+        draw_handle.draw_texture(&game_core.resources.shop_background, 0, 0, Color::WHITE);
 
         // Render title
         draw_handle.draw_text(
@@ -56,7 +58,7 @@ impl Screen for MainMenuScreen {
             (win_width / 4),
             60,
             match hovering_play_button {
-                true => Color::GREEN,
+                true => Color::BLUE,
                 false => Color::BLACK,
             },
         );
@@ -66,7 +68,7 @@ impl Screen for MainMenuScreen {
             (win_width / 4) + 100,
             60,
             match hovering_shop_button {
-                true => Color::GREEN,
+                true => Color::BLUE,
                 false => Color::BLACK,
             },
         );
@@ -76,7 +78,7 @@ impl Screen for MainMenuScreen {
             (win_width / 4) + 200,
             60,
             match hovering_quit_button {
-                true => Color::GREEN,
+                true => Color::RED,
                 false => Color::BLACK,
             },
         );