From 482a4990baa4f68ed30f196de9b98e68a0dc6a82 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@googlemail.com>
Date: Mon, 20 Jun 2022 06:38:52 +0200
Subject: [PATCH] Fix unhandled promise rejection, minor polishing

---
 res/ui/icons/savegame_correct.png             | Bin 0 -> 1973 bytes
 src/css/ingame_hud/standalone_advantages.scss |  21 +++++++++++++++++-
 .../game/hud/parts/standalone_advantages.js   |   4 +++-
 src/js/platform/browser/game_analytics.js     |   2 ++
 src/js/states/main_menu.js                    |   5 +++++
 5 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 res/ui/icons/savegame_correct.png

diff --git a/res/ui/icons/savegame_correct.png b/res/ui/icons/savegame_correct.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcbce3dcd1d598010ab795666cf353f2d28c765c
GIT binary patch
literal 1973
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

literal 0
HcmV?d00001

diff --git a/src/css/ingame_hud/standalone_advantages.scss b/src/css/ingame_hud/standalone_advantages.scss
index 0be61a5e..0f681242 100644
--- a/src/css/ingame_hud/standalone_advantages.scss
+++ b/src/css/ingame_hud/standalone_advantages.scss
@@ -89,14 +89,31 @@
             box-sizing: border-box;
             text-align: center;
             @include S(border-radius, $globalBorderRadius);
-            @include S(padding, 4px, 4px);
+            @include S(padding, 8px, 10px, 8px, 20px);
             @include S(margin-bottom, 15px);
             pointer-events: all;
             transition: background-color 0.12s ease-in-out;
             color: rgba(#000, 0.5);
 
+            width: 100%;
+            background: rgba($colorGreenBright, 0.2);
             cursor: pointer;
 
+            display: grid;
+            grid-template-columns: auto 1fr;
+            @include S(grid-gap, 5px);
+
+            &::before {
+                content: "";
+                display: inline-flex;
+                @include S(width, 15px);
+                @include S(height, 15px);
+                & {
+                    /* load-async */
+                    background: uiResource("icons/savegame_correct.png") center center / contain no-repeat;
+                }
+            }
+
             strong {
                 color: #000;
             }
@@ -145,6 +162,7 @@
         background: #eff2f4 #{D(12px)} center / #{D(30px)} no-repeat;
 
         @include S(border-radius, $globalBorderRadius);
+        align-items: center;
         @include S(padding, 10px, 4px, 4px);
         @include S(height, 40px);
 
@@ -160,6 +178,7 @@
             grid-column: 2 / 3;
             grid-row: 2 / 3;
             @include SuperSmallText;
+            line-height: 1em;
             opacity: 0.8;
         }
 
diff --git a/src/js/game/hud/parts/standalone_advantages.js b/src/js/game/hud/parts/standalone_advantages.js
index 2ce5c6ee..0229a712 100644
--- a/src/js/game/hud/parts/standalone_advantages.js
+++ b/src/js/game/hud/parts/standalone_advantages.js
@@ -35,7 +35,9 @@ export class HUDStandaloneAdvantages extends BaseHUDPart {
 
             <div class="lowerBar">
 
-            <div class="playtimeDisclaimerDownload">${T.demoBanners.playtimeDisclaimerDownload}</div>
+            <div class="playtimeDisclaimerDownload"><span class="inner">${
+                T.demoBanners.playtimeDisclaimerDownload
+            }</span></div>
 
             <button class="steamLinkButton steam_dlbtn_0">
             ${
diff --git a/src/js/platform/browser/game_analytics.js b/src/js/platform/browser/game_analytics.js
index eb252977..50398ba8 100644
--- a/src/js/platform/browser/game_analytics.js
+++ b/src/js/platform/browser/game_analytics.js
@@ -324,6 +324,8 @@ export class ShapezGameAnalytics extends GameAnalyticsInterface {
             version: G_BUILD_VERSION,
             level: root.hubGoals.level,
             gameDump: this.generateGameDump(root),
+        }).catch(err => {
+            console.warn("Request failed", err);
         });
     }
 
diff --git a/src/js/states/main_menu.js b/src/js/states/main_menu.js
index ff013bc0..741370e3 100644
--- a/src/js/states/main_menu.js
+++ b/src/js/states/main_menu.js
@@ -823,6 +823,11 @@ export class MainMenuState extends GameState {
         });
 
         const savegame = this.app.savegameMgr.getSavegameById(latestInternalId);
+        if (!savegame) {
+            console.warn("No savegame to continue found:", this.app.savegameMgr.currentData.savegames);
+            return;
+        }
+
         savegame
             .readAsync()
             .then(() => this.app.adProvider.showVideoAd())