games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Merge pull request #6163 from Laserlicht/market_text

Browse Source 
fix market text
This commit is contained in:
Ivan Savenko
2025-09-21 20:15:24 +03:00
committed by GitHub
parent b93249bba2 759571879e
commit 1ccd917632
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/widgets/markets/CMarketBase.h
View File

@@ -118,7 +118,7 @@ public:
void deselect() override; void deselect() override;
void makeDeal() override; void makeDeal() override;
const Point traderTextDimensions = Point(260, 75); const Point traderTextDimensions = Point(256, 75);
std::shared_ptr<CTextBox> traderText; std::shared_ptr<CTextBox> traderText;
bool madeTransaction; bool madeTransaction;

4
client/widgets/markets/CMarketResources.cpp
View File

@@ -110,10 +110,10 @@ std::string CMarketResources::getTraderText()
MetaString message = MetaString::createFromTextID("core.genrltxt.157"); MetaString message = MetaString::createFromTextID("core.genrltxt.157");
message.replaceNumber(offerQty); message.replaceNumber(offerQty);
message.replaceRawString(offerQty == 1 ? LIBRARY->generaltexth->allTexts[161] : LIBRARY->generaltexth->allTexts[160]); message.replaceRawString(offerQty == 1 ? LIBRARY->generaltexth->allTexts[161] : LIBRARY->generaltexth->allTexts[160]);
message.replaceName(GameResID(bidTradePanel->getHighlightedItemId())); message.replaceName(GameResID(offerTradePanel->getHighlightedItemId()));
message.replaceNumber(bidQty); message.replaceNumber(bidQty);
message.replaceRawString(bidQty == 1 ? LIBRARY->generaltexth->allTexts[161] : LIBRARY->generaltexth->allTexts[160]); message.replaceRawString(bidQty == 1 ? LIBRARY->generaltexth->allTexts[161] : LIBRARY->generaltexth->allTexts[160]);
message.replaceName(GameResID(offerTradePanel->getHighlightedItemId())); message.replaceName(GameResID(bidTradePanel->getHighlightedItemId()));
return message.toString(); return message.toString();
} }
else else