mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2024-12-31 19:51:41 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #3600 - multiplayer game reloading and screen resize no longer reset map zoom and position

Browse Source
This commit is contained in:
Yair Morgenstern 2021-02-16 20:00:47 +02:00
parent 7c09663271
commit 105d9690ff
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -138,3 +138,4 @@ android/assets/mods/
android/assets/SaveFiles/
android/assets/GameSettingsOld.json
android/assets/scenarios/
android/assets/MultiplayerGames/

4
core/src/com/unciv/UncivGame.kt
View File

@ -129,10 +129,6 @@ class UncivGame(parameters: UncivGameParameters) : Game() {
}
}
fun loadGame(gameName: String) {
loadGame(GameSaver.loadGameByName(gameName))
}
fun startMusic() {
if (settings.musicVolume < 0.01) return

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

@ -14,6 +14,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align
import com.unciv.Constants
import com.unciv.logic.GameInfo
import com.unciv.logic.GameSaver
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.civilization.diplomacy.DiplomaticStatus
@ -44,7 +45,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
var isPlayersTurn = viewingCiv == gameInfo.currentPlayerCiv // todo this should be updated when passing turns
var selectedCiv = viewingCiv // Selected civilization, used in spectator and replay mode, equals viewingCiv in ordinary games
var fogOfWar = true
private var fogOfWar = true
val canChangeState = isPlayersTurn && !viewingCiv.isSpectator()
private var waitingForAutosave = false
@ -143,7 +144,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
if (gameInfo.gameParameters.isOnlineMultiplayer && !gameInfo.isUpToDate)
isPlayersTurn = false // until we're up to date, don't let the player do anything
if (gameInfo.gameParameters.isOnlineMultiplayer && !isPlayersTurn) {
if (gameInfo.gameParameters.isOnlineMultiplayer && !isPlayersTurn && !gameInfo.isUpToDate) {
// restart the timer
stopMultiPlayerRefresher()
@ -249,7 +250,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
} else { //else we found it is the player's turn again, turn off polling and load turn
stopMultiPlayerRefresher()
latestGame.isUpToDate = true
Gdx.app.postRunnable { game.loadGame(latestGame) }
Gdx.app.postRunnable { createNewWorldScreen(latestGame) }
}
} catch (ex: Exception) {
@ -446,11 +447,11 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
}
private fun updateSelectedCiv() {
if (bottomUnitTable.selectedUnit != null)
selectedCiv = bottomUnitTable.selectedUnit!!.civInfo
else if (bottomUnitTable.selectedCity != null)
selectedCiv = bottomUnitTable.selectedCity!!.civInfo
else viewingCiv
when {
bottomUnitTable.selectedUnit != null -> selectedCiv = bottomUnitTable.selectedUnit!!.civInfo
bottomUnitTable.selectedCity != null -> selectedCiv = bottomUnitTable.selectedCity!!.civInfo
else -> viewingCiv
}
}
private fun createFogOfWarButton(): TextButton {
@ -479,6 +480,24 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
return nextTurnButton
}
fun createNewWorldScreen(gameInfo:GameInfo) {
game.gameInfo = gameInfo
val newWorldScreen = WorldScreen(gameInfo.getPlayerToViewAs())
newWorldScreen.mapHolder.scrollX = mapHolder.scrollX
newWorldScreen.mapHolder.scrollY = mapHolder.scrollY
newWorldScreen.mapHolder.scaleX = mapHolder.scaleX
newWorldScreen.mapHolder.scaleY = mapHolder.scaleY
newWorldScreen.mapHolder.updateVisualScroll()
newWorldScreen.selectedCiv = gameInfo.getCivilization(selectedCiv.civName)
newWorldScreen.fogOfWar = fogOfWar
game.worldScreen = newWorldScreen
game.setWorldScreen()
}
private fun nextTurn() {
isPlayersTurn = false
shouldUpdate = true
@ -518,26 +537,12 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
// do this on main thread - it's the only one that has a GL context to create images from
Gdx.app.postRunnable {
fun createNewWorldScreen() {
val newWorldScreen = WorldScreen(gameInfoClone.getPlayerToViewAs())
newWorldScreen.mapHolder.scrollX = mapHolder.scrollX
newWorldScreen.mapHolder.scrollY = mapHolder.scrollY
newWorldScreen.mapHolder.scaleX = mapHolder.scaleX
newWorldScreen.mapHolder.scaleY = mapHolder.scaleY
newWorldScreen.mapHolder.updateVisualScroll()
newWorldScreen.selectedCiv = gameInfoClone.getCivilization(selectedCiv.civName)
newWorldScreen.fogOfWar = fogOfWar
game.worldScreen = newWorldScreen
game.setWorldScreen()
}
if (gameInfoClone.currentPlayerCiv.civName != viewingCiv.civName
&& !gameInfoClone.gameParameters.isOnlineMultiplayer)
game.setScreen(PlayerReadyScreen(gameInfoClone.getCurrentPlayerCivilization()))
else {
createNewWorldScreen()
createNewWorldScreen(gameInfoClone)
}
if (shouldAutoSave) {
@ -612,10 +617,8 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
}
override fun resize(width: Int, height: Int) {
if (stage.viewport.screenWidth != width || stage.viewport.screenHeight != height) {
game.worldScreen = WorldScreen(viewingCiv) // start over.
game.setWorldScreen()
}
if (stage.viewport.screenWidth != width || stage.viewport.screenHeight != height)
createNewWorldScreen(gameInfo) // start over
}
@ -630,8 +633,8 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
}
// topBar.selectedCivLabel.setText(Gdx.graphics.framesPerSecond) // for framerate testing
var scrollPos = Vector2(mapHolder.scrollX, mapHolder.scrollY);
var viewScale = Vector2(mapHolder.scaleX, mapHolder.scaleY);
val scrollPos = Vector2(mapHolder.scrollX, mapHolder.scrollY)
val viewScale = Vector2(mapHolder.scaleX, mapHolder.scaleY)
minimapWrapper.minimap.updateScrollPosistion(scrollPos, viewScale)
super.render(delta)