Skip to content
Permalink
Browse files

trying to pull

  • Loading branch information
Joe Hill
Joe Hill committed Apr 23, 2017
1 parent 1378185 commit 3ef3b3ed3fd0d38bf83e44655f5286eacd24f410
Showing with 6 additions and 6 deletions.
  1. BIN bin/controller/Cashflow.class
  2. +5 −4 src/controller/Cashflow.java
  3. +1 −2 src/view/MainMenu.java
BIN -40 Bytes (98%) bin/controller/Cashflow.class
Binary file not shown.
@@ -8,9 +8,7 @@

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

@@ -20,9 +18,12 @@ public static void go()
{
System.out.println("Start game");
// Joe
// Initialize players (pick professions)

// Initialize game board
_board = new GameBoard();
// Initialize GUI
// Initialize players (pick professions)



/*
@@ -14,7 +14,7 @@

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

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

0 comments on commit 3ef3b3e

Please sign in to comment.
You can’t perform that action at this time.