mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 10:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity

3.13.3-patch2

Browse Source 
Multiplayer auto-load working again
This commit is contained in:
Yair Morgenstern 2021-02-28 00:10:05 +02:00
parent ed8d642036
commit 32ca9884ce
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.4.30" const val kotlinVersion = "1.4.30"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 535 const val appCodeNumber = 536
const val appVersion = "3.13.3-patch1" const val appVersion = "3.13.3-patch2"
const val gdxVersion = "1.9.14" const val gdxVersion = "1.9.14"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

8
core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
View File

@ -145,14 +145,16 @@ class NewGameScreen(previousScreen:CameraStageBaseScreen, _gameSetupInfo: GameSe
newGame!!.isUpToDate = true // So we don't try to download it from dropbox the second after we upload it - the file is not yet ready for loading! newGame!!.isUpToDate = true // So we don't try to download it from dropbox the second after we upload it - the file is not yet ready for loading!
try { try {
OnlineMultiplayer().tryUploadGame(newGame!!) OnlineMultiplayer().tryUploadGame(newGame!!)
GameSaver.autoSave(newGame!!) {}
// Saved as Multiplayer game to show up in the session browser
GameSaver.saveGame(newGame!!, newGame!!.gameId, true)
// Save gameId to clipboard because you have to do it anyway. // Save gameId to clipboard because you have to do it anyway.
Gdx.app.clipboard.contents = newGame!!.gameId Gdx.app.clipboard.contents = newGame!!.gameId
// Popup to notify the User that the gameID got copied to the clipboard // Popup to notify the User that the gameID got copied to the clipboard
Gdx.app.postRunnable { ToastPopup("gameID copied to clipboard".tr(), UncivGame.Current.worldScreen, 2500) } Gdx.app.postRunnable { ToastPopup("gameID copied to clipboard".tr(), UncivGame.Current.worldScreen, 2500) }
GameSaver.autoSave(newGame!!) {}
// Saved as Multiplayer game to show up in the session browser
GameSaver.saveGame(newGame!!, newGame!!.gameId, true)
} catch (ex: Exception) { } catch (ex: Exception) {
Gdx.app.postRunnable { Gdx.app.postRunnable {
val cantUploadNewGamePopup = Popup(this) val cantUploadNewGamePopup = Popup(this)

2
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -144,7 +144,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
if (gameInfo.gameParameters.isOnlineMultiplayer && !gameInfo.isUpToDate) if (gameInfo.gameParameters.isOnlineMultiplayer && !gameInfo.isUpToDate)
isPlayersTurn = false // until we're up to date, don't let the player do anything isPlayersTurn = false // until we're up to date, don't let the player do anything
if (gameInfo.gameParameters.isOnlineMultiplayer && !isPlayersTurn && !gameInfo.isUpToDate) { if (gameInfo.gameParameters.isOnlineMultiplayer && !isPlayersTurn) {
// restart the timer // restart the timer
stopMultiPlayerRefresher() stopMultiPlayerRefresher()