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

Resolved #893 - trade table doesn't reset after trade

Browse Source
This commit is contained in:
Yair Morgenstern
2019-06-24 06:52:46 +03:00
parent 3b9ab43bbe
commit 477a4889b3
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/ui/trade/TradeTable.kt
View File

@ -57,7 +57,7 @@ class TradeTable(val otherCivilization: CivilizationInfo, stage: Stage, onTradeC
} }
else if(offerButton.text.toString() == "Accept".tr()){ else if(offerButton.text.toString() == "Accept".tr()){
tradeLogic.acceptTrade() tradeLogic.acceptTrade()
offerColumnsTable = OfferColumnsTable(tradeLogic, stage) { onChange() } offerColumnsTable = OfferColumnsTable(TradeLogic(currentPlayerCiv,otherCivilization), stage) { onChange() }
offerColumnsTableWrapper.clear() offerColumnsTableWrapper.clear()
offerColumnsTableWrapper.add(offerColumnsTable) offerColumnsTableWrapper.add(offerColumnsTable)
if(tradeLogic.currentTrade.ourOffers.any { it.name== Constants.peaceTreaty }) if(tradeLogic.currentTrade.ourOffers.any { it.name== Constants.peaceTreaty })
@ -65,7 +65,6 @@ class TradeTable(val otherCivilization: CivilizationInfo, stage: Stage, onTradeC
else tradeText.setText("Pleasure doing business with you!".tr()) else tradeText.setText("Pleasure doing business with you!".tr())
onTradeComplete() onTradeComplete()
tradeLogic = TradeLogic(currentPlayerCiv,otherCivilization)
offerButton.setText("Offer trade".tr()) offerButton.setText("Offer trade".tr())
} }
} }