trying to pull

joh13010 · Apr 23, 2017 · 3ef3b3e · 3ef3b3e
1 parent 1378185
commit 3ef3b3e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/bin/controller/Cashflow.class b/bin/controller/Cashflow.class
diff --git a/src/controller/Cashflow.java b/src/controller/Cashflow.java
@@ -8,9 +8,7 @@ import model.*;
 
 public class Cashflow
 {
-	private GameBoard _board;
+	private static GameBoard _board;
-	public Player[] players;
-	//private CardStack[] _cards;
 	public GameboardWindow gameboard;
 	public static int numPlayers;
 
@@ -20,9 +18,12 @@ public class Cashflow
 	{
 		System.out.println("Start game");
 		// Joe
+		// Initialize players (pick professions)
+
 		// Initialize game board
+		_board = new GameBoard();
 		// Initialize GUI
-		// Initialize players (pick professions)
+
 
 
 		/*

diff --git a/src/view/MainMenu.java b/src/view/MainMenu.java
@@ -14,7 +14,7 @@ import model.Instructions;
 
 public class MainMenu 
 {
-	public static void main (String[] args)
+	public MainMenu()
 	{
 	final JFrame frame = new JFrame("CashFlow");
 
@@ -273,7 +273,6 @@ public class MainMenu
 	start.addActionListener(new ActionListener() {
 		public void actionPerformed(ActionEvent e) {
 			frame.dispose();
-			Cashflow.go();
 			System.exit(0);
 		}          
 });