Fixed another potential bug, added changelog

Bombbird2001 · Nov 2, 2021 · adf91c2 · adf91c2
1 parent a9e9daf
commit adf91c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/core/src/com/bombbird/terminalcontrol/screens/ChangelogScreen.kt b/core/src/com/bombbird/terminalcontrol/screens/ChangelogScreen.kt
@@ -35,6 +35,15 @@ class ChangelogScreen(game: TerminalControl, background: Image?) : StandardUIScr
         fun loadHashmapContent(full: Boolean, android: Boolean, desktop: Boolean) {
             if (changeLogContent.size > 0) return
 
+            //Version 1.5.2111.1
+            val content29 = Array<String>()
+            content29.add("-Alarms will no longer play for subsequent wake infringement that occur in quick succession if already previously silenced by player, to prevent nuisance")
+            content29.add("-Fixed text at loading screen occasionally getting corrupted")
+            content29.add("-Fixed a bug occasionally causing game load fails")
+            content29.add("-Fixed an aircraft route bug that causes crashes in some situations")
+            content29.add("-Fixed a bug where waypoint name is sometimes not displayed in the default datatag configuration")
+            addVersionInfo("1.5", "2111.1", content29)
+
             //Version 1.5.2110.1
             val content28 = Array<String>()
             content28.add("-Mechanics: Improvements to existing navigation data for more realism, accuracy")

diff --git a/core/src/com/bombbird/terminalcontrol/screens/gamescreen/GameScreen.kt b/core/src/com/bombbird/terminalcontrol/screens/gamescreen/GameScreen.kt
@@ -116,11 +116,11 @@ open class GameScreen(val game: TerminalControl) : Screen, GestureListener, Inpu
         val labelStyle = LabelStyle()
         labelStyle.font = Fonts.defaultFont20
         labelStyle.fontColor = Color.WHITE
-        loadingLabel = Label("", labelStyle)
         val labelStyle1 = LabelStyle()
         labelStyle1.font = Fonts.defaultFont16
         labelStyle1.fontColor = Color.WHITE
         Gdx.app.postRunnable {
+            loadingLabel = Label("", labelStyle)
             tipLabel = Label("", labelStyle1)
             tipLabel.setText(randomTip())
             tipLabel.setPosition(2880 - xOffset - tipLabel.prefWidth / 2, 960f)
@@ -353,10 +353,12 @@ open class GameScreen(val game: TerminalControl) : Screen, GestureListener, Inpu
                         loadedTime > 0.5 -> if (liveWeather) "Loading live weather..  " else "Loading..  "
                         else -> if (liveWeather) "Loading live weather.   " else "Loading.   "
                     }
-                    loadingLabel.setText(loadingText)
-                    loadingLabel.setPosition(2880 - xOffset - loadingLabel.prefWidth / 2, 1550f)
                     game.batch.begin()
-                    loadingLabel.draw(game.batch, 1f)
+                    if (this::loadingLabel.isInitialized) {
+                        loadingLabel.setText(loadingText)
+                        loadingLabel.setPosition(2880 - xOffset - loadingLabel.prefWidth / 2, 1550f)
+                        loadingLabel.draw(game.batch, 1f)
+                    }
                     if (this::tipLabel.isInitialized) tipLabel.draw(game.batch, 1f)
                     game.batch.end()
                 } else {