Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
trying to pull
  • Loading branch information
Joe Hill committed Apr 23, 2017
1 parent 1378185 commit 3ef3b3e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
Binary file modified bin/controller/Cashflow.class
Binary file not shown.
9 changes: 5 additions & 4 deletions src/controller/Cashflow.java
Expand Up @@ -8,9 +8,7 @@ import model.*;

public class Cashflow
{
private GameBoard _board;
public Player[] players;
//private CardStack[] _cards;
private static GameBoard _board;
public GameboardWindow gameboard;
public static int numPlayers;

Expand All @@ -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)



/*
Expand Down
3 changes: 1 addition & 2 deletions src/view/MainMenu.java
Expand Up @@ -14,7 +14,7 @@ import model.Instructions;

public class MainMenu
{
public static void main (String[] args)
public MainMenu()
{
final JFrame frame = new JFrame("CashFlow");

Expand Down Expand Up @@ -273,7 +273,6 @@ public class MainMenu
start.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
frame.dispose();
Cashflow.go();
System.exit(0);
}
});
Expand Down

0 comments on commit 3ef3b3e

Please sign in to comment.