mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-18 19:59:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Retrieving the construction info in a different thread now works perfectly!

Browse Source
This commit is contained in:
Yair Morgenstern
2021-01-16 21:12:55 +02:00
parent 7e092fdf16
commit b27c744cd2
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/unciv/logic/city/CityConstructions.kt
View File

@ -201,11 +201,14 @@ class CityConstructions {
val cityStatsForConstruction: Stats val cityStatsForConstruction: Stats
if (currentConstructionFromQueue == constructionName) cityStatsForConstruction = cityInfo.cityStats.currentCityStats if (currentConstructionFromQueue == constructionName) cityStatsForConstruction = cityInfo.cityStats.currentCityStats
else { else {
// The ol' Switcharoo - what would our stats be if that was our current construction? /*
// Since this is only ever used for UI purposes, I feel fine with having it be a bit inefficient The ol' Switcharoo - what would our stats be if that was our current construction?
// and recalculating the entire city stats Since this is only ever used for UI purposes, I feel fine with having it be a bit inefficient
// We don't want to change our current construction queue - what if we have an empty queue, too many changes to check for - and recalculating the entire city stats
// So we must clone it and see what would happen if that was our construction We don't want to change our current construction queue - what if we have an empty queue,
this can affect the city if we run it on another thread like in ConstructionsTable -
So we run the numbers for the other construction
*/
val construction = cityInfo.cityConstructions.getConstruction(constructionName) val construction = cityInfo.cityConstructions.getConstruction(constructionName)
cityInfo.cityStats.update(construction) cityInfo.cityStats.update(construction)

2
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -167,9 +167,9 @@ class ConstructionsTable(val cityScreen: CityScreen) : Table(CameraStageBaseScre
thread { thread {
val constructionButtonDTOList = getConstructionButtonDTOs() // Since this can be a heavy operation and leads to many ANRs on older phones...
Gdx.app.postRunnable { Gdx.app.postRunnable {
// For some bizarre reason, moving this to another thread messes up the entire construction list?! Haven't figured out why yet // For some bizarre reason, moving this to another thread messes up the entire construction list?! Haven't figured out why yet
val constructionButtonDTOList = getConstructionButtonDTOs() // Since this can be a heavy operation and leads to many ANRs on older phones...
availableConstructionsTable.clear() availableConstructionsTable.clear()
for (dto in constructionButtonDTOList) { for (dto in constructionButtonDTOList) {