AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 12:54:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "perf(memory): Save unit icon location on baseunit"

Browse Source 
This reverts commit ba37be8641459509e2f28b1209ee4d89f8472d02.
This commit is contained in:
yairm210 2024-11-05 15:51:06 +02:00
parent f1f37fcd74
commit b68c4d3edc
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/models/ruleset/unit/BaseUnit.kt
View File

@ -63,9 +63,6 @@ class BaseUnit : RulesetObject(), INonPerpetualConstruction {
@Transient
var cachedForceEvaluation: Int = -1
@delegate:Transient // memory perf optimization to not create the string per unit
val unitIconLocation by lazy { "UnitIcons/$name.png" }
@Transient
val costFunctions = BaseUnitCost(this)

4
core/src/com/unciv/ui/images/ImageGetter.kt
View File

@ -251,8 +251,8 @@ object ImageGetter {
fun getRandomNationPortrait(size: Float): Portrait = PortraitNation(Constants.random, size)
fun getUnitIcon(unit: BaseUnit, color: Color = Color.BLACK): Image =
if (imageExists(unit.unitIconLocation))
getImage(unit.unitIconLocation).apply { this.color = color }
if (imageExists("UnitIcons/${unit.name}"))
getImage("UnitIcons/${unit.name}").apply { this.color = color }
else getImage("UnitTypeIcons/${unit.type}").apply { this.color = color }
fun getConstructionPortrait(construction: String, size: Float): Group {