diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class index 80cfd97..5f0c2fd 100644 Binary files a/bin/model/CharityTile.class and b/bin/model/CharityTile.class differ diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class index 16e5fb8..641fd5f 100644 Binary files a/bin/model/DealTile.class and b/bin/model/DealTile.class differ diff --git a/bin/view/CharityWindow$2.class b/bin/view/CharityWindow$2.class index bc1b15a..940ee30 100644 Binary files a/bin/view/CharityWindow$2.class and b/bin/view/CharityWindow$2.class differ diff --git a/bin/view/CharityWindow$3.class b/bin/view/CharityWindow$3.class index 2476f5b..e4625f3 100644 Binary files a/bin/view/CharityWindow$3.class and b/bin/view/CharityWindow$3.class differ diff --git a/bin/view/CharityWindow.class b/bin/view/CharityWindow.class index 788f787..55725da 100644 Binary files a/bin/view/CharityWindow.class and b/bin/view/CharityWindow.class differ diff --git a/src/model/CharityTile.java b/src/model/CharityTile.java index a732946..d23b593 100644 --- a/src/model/CharityTile.java +++ b/src/model/CharityTile.java @@ -1,5 +1,7 @@ package model; +import view.CharityWindow; + public class CharityTile extends Tile { @@ -15,6 +17,24 @@ public class CharityTile extends Tile FinancialStatement f = p.getFinancialStatement(); // call view method // TODO + CharityWindow charityWindow = new CharityWindow(); + charityWindow.showButtonDemo(); + + + while(!charityWindow.hasAnswered) + { + try { + Thread.sleep(200); + } catch(InterruptedException e) { + + } + } + System.out.println(charityWindow.doesDonate); + + // Pick card from big/small deal stack: + Card c; + if(charityWindow.doesDonate) + if (p.donateCharity()) { diff --git a/src/model/DealTile.java b/src/model/DealTile.java index 50617dc..3decb40 100644 --- a/src/model/DealTile.java +++ b/src/model/DealTile.java @@ -43,7 +43,7 @@ public class DealTile extends Tile } else { - c = _smallDealStack.pickCard(); + c = _bigDealStack.pickCard(); } // If stock, update price, then ask user if they want to buy and ask everyone if they want to sell: diff --git a/src/view/CharityWindow.java b/src/view/CharityWindow.java index cd4d271..ebba336 100644 --- a/src/view/CharityWindow.java +++ b/src/view/CharityWindow.java @@ -60,7 +60,6 @@ public class CharityWindow { JButton DontDonate = new JButton("Don't Donate"); DontDonate.setHorizontalTextPosition(SwingConstants.LEFT); - boolean donate = false; Donate.addMouseListener(new MouseListener() { @Override