small changes

joh13010 · Apr 6, 2017 · b90e6c8 · b90e6c8
1 parent cc8ac19
commit b90e6c8
Show file tree

Hide file tree

Showing 34 changed files with 6 additions and 2 deletions.
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -1 +1,4 @@
+/.DS_Store
 /controller/
+/model/
+/view/
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
diff --git a/bin/model/BigDealStack.class b/bin/model/BigDealStack.class
diff --git a/bin/model/Card.class b/bin/model/Card.class
diff --git a/bin/model/CardStack.class b/bin/model/CardStack.class
diff --git a/bin/model/CharityTile.class b/bin/model/CharityTile.class
diff --git a/bin/model/ChildTile.class b/bin/model/ChildTile.class
diff --git a/bin/model/DealCard.class b/bin/model/DealCard.class
diff --git a/bin/model/DealTile.class b/bin/model/DealTile.class
diff --git a/bin/model/Die.class b/bin/model/Die.class
diff --git a/bin/model/DoodadCard.class b/bin/model/DoodadCard.class
diff --git a/bin/model/DoodadStack.class b/bin/model/DoodadStack.class
diff --git a/bin/model/DoodadTile.class b/bin/model/DoodadTile.class
diff --git a/bin/model/FinancialStatement.class b/bin/model/FinancialStatement.class
diff --git a/bin/model/GameBoard.class b/bin/model/GameBoard.class
diff --git a/bin/model/MarketCard.class b/bin/model/MarketCard.class
diff --git a/bin/model/MarketStack.class b/bin/model/MarketStack.class
diff --git a/bin/model/MarketTile.class b/bin/model/MarketTile.class
diff --git a/bin/model/OwnedRealEstate.class b/bin/model/OwnedRealEstate.class
diff --git a/bin/model/PaydayTile.class b/bin/model/PaydayTile.class
diff --git a/bin/model/Player.class b/bin/model/Player.class
diff --git a/bin/model/Profession.class b/bin/model/Profession.class
diff --git a/bin/model/Professions.class b/bin/model/Professions.class
diff --git a/bin/model/SmallDealStack.class b/bin/model/SmallDealStack.class
diff --git a/bin/model/Stock.class b/bin/model/Stock.class
diff --git a/bin/model/Tile.class b/bin/model/Tile.class
diff --git a/bin/model/TileCircularLinkedList$Node.class b/bin/model/TileCircularLinkedList$Node.class
diff --git a/bin/model/TileCircularLinkedList.class b/bin/model/TileCircularLinkedList.class
diff --git a/bin/view/MainWindow$1.class b/bin/view/MainWindow$1.class
diff --git a/bin/view/MainWindow.class b/bin/view/MainWindow.class
diff --git a/bin/view/MainWindow1$1.class b/bin/view/MainWindow1$1.class
diff --git a/bin/view/MainWindow1.class b/bin/view/MainWindow1.class
diff --git a/bin/view/Window.class b/bin/view/Window.class
diff --git a/src/model/DealTile.java b/src/model/DealTile.java
@@ -29,15 +29,16 @@ public void getLandedOn(Player p)
 		Card c;
 		if(input.equals("1"))
 		{
-			c = _smallDealStack.pickCard()
+			c = _smallDealStack.pickCard();
 		}
 		else 
 		{
 			c = _smallDealStack.pickCard();
 		}
 
 		// If stock, update price, then ask user if they want to buy and ask everyone if they want to sell:
-		if(c.getTitle().equals(anObject))
+		//if(c.getTitle().equals(anObject))
+
 		// If property, ask user if they want to do it (and check if they can afford the down payment):
 		// If yes, call ButIncomeProperty method:
 		// Else, do nothing: