games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Fixed #849. Fixed buying artifacts for free.

Browse Source 
Minor tweaks.
This commit is contained in:
DjWarmonger
2012-01-28 11:42:15 +00:00
parent 855cebfe81
commit 56c56f81e3
3 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CObjectHandler.cpp
View File

@ -6816,8 +6816,7 @@ bool IMarket::getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMar
if(id1 != 6) //non-gold prices are doubled
r /= 2;
assert(g >= r); //should we allow artifacts cheaper than unit of resource?
val1 = (g / r) + 0.5;
val1 = std::max(1, (int)((g / r) + 0.5)); //don't sell arts for less than 1 resource
val2 = 1;
}
break;
@ -6831,7 +6830,7 @@ bool IMarket::getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMar
// r /= 2;
val1 = 1;
val2 = (r / g) + 0.5;
val2 = std::max(1, (int)((r / g) + 0.5)); //at least one resource is given in return
}
break;
case EMarketMode::CREATURE_EXP: