Skip to content

Commit adf91c2

Browse files
committed
Fixed another potential bug, added changelog
1 parent a9e9daf commit adf91c2

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

core/src/com/bombbird/terminalcontrol/screens/ChangelogScreen.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,15 @@ class ChangelogScreen(game: TerminalControl, background: Image?) : StandardUIScr
3535
fun loadHashmapContent(full: Boolean, android: Boolean, desktop: Boolean) {
3636
if (changeLogContent.size > 0) return
3737

38+
//Version 1.5.2111.1
39+
val content29 = Array<String>()
40+
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")
41+
content29.add("-Fixed text at loading screen occasionally getting corrupted")
42+
content29.add("-Fixed a bug occasionally causing game load fails")
43+
content29.add("-Fixed an aircraft route bug that causes crashes in some situations")
44+
content29.add("-Fixed a bug where waypoint name is sometimes not displayed in the default datatag configuration")
45+
addVersionInfo("1.5", "2111.1", content29)
46+
3847
//Version 1.5.2110.1
3948
val content28 = Array<String>()
4049
content28.add("-Mechanics: Improvements to existing navigation data for more realism, accuracy")

core/src/com/bombbird/terminalcontrol/screens/gamescreen/GameScreen.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ open class GameScreen(val game: TerminalControl) : Screen, GestureListener, Inpu
116116
val labelStyle = LabelStyle()
117117
labelStyle.font = Fonts.defaultFont20
118118
labelStyle.fontColor = Color.WHITE
119-
loadingLabel = Label("", labelStyle)
120119
val labelStyle1 = LabelStyle()
121120
labelStyle1.font = Fonts.defaultFont16
122121
labelStyle1.fontColor = Color.WHITE
123122
Gdx.app.postRunnable {
123+
loadingLabel = Label("", labelStyle)
124124
tipLabel = Label("", labelStyle1)
125125
tipLabel.setText(randomTip())
126126
tipLabel.setPosition(2880 - xOffset - tipLabel.prefWidth / 2, 960f)
@@ -353,10 +353,12 @@ open class GameScreen(val game: TerminalControl) : Screen, GestureListener, Inpu
353353
loadedTime > 0.5 -> if (liveWeather) "Loading live weather.. " else "Loading.. "
354354
else -> if (liveWeather) "Loading live weather. " else "Loading. "
355355
}
356-
loadingLabel.setText(loadingText)
357-
loadingLabel.setPosition(2880 - xOffset - loadingLabel.prefWidth / 2, 1550f)
358356
game.batch.begin()
359-
loadingLabel.draw(game.batch, 1f)
357+
if (this::loadingLabel.isInitialized) {
358+
loadingLabel.setText(loadingText)
359+
loadingLabel.setPosition(2880 - xOffset - loadingLabel.prefWidth / 2, 1550f)
360+
loadingLabel.draw(game.batch, 1f)
361+
}
360362
if (this::tipLabel.isInitialized) tipLabel.draw(game.batch, 1f)
361363
game.batch.end()
362364
} else {

0 commit comments

Comments
 (0)