merging 1.7.5 source: windows changes

This commit is contained in:
Evan Debenham
2015-02-06 01:07:22 -05:00
parent 7cc5192839
commit 68406db6fe
18 changed files with 188 additions and 134 deletions
@@ -39,7 +39,7 @@ public class WndTradeItem extends Window {
private static final float GAP = 2;
private static final int WIDTH = 120;
private static final int BTN_HEIGHT = 18;
private static final int BTN_HEIGHT = 16;
private static final String TXT_SALE = "FOR SALE: %s - %dg";
private static final String TXT_BUY = "Buy for %dg";
@@ -262,7 +262,6 @@ public class WndTradeItem extends Window {
}
private int price( Item item ) {
// This formula is not completely correct...
int price = item.price() * 5 * (Dungeon.depth / 5 + 1);
return price;
}