Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

original game? (reverted from commit 3fc6c98ea5)

Browse Source 
Fixed overwrited code
This commit is contained in:
jancoow
2015-06-02 10:22:52 +02:00
parent 3fc6c98ea5
commit df207836e0
21 changed files with 647 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/GameModel.java
+3 -5
View File
@@ -6,23 +6,21 @@ import java.awt.event.ActionListener;
import javax.swing.Timer;
import view.GameView;
import control.GameStateManager;
import control.button.ButtonHandler;
public class GameModel implements ActionListener{
public static double framePerSecondUpdate = 1000/30;
private Timer update;
private Timer update;
public static Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN,Color.WHITE};
private GameStateManager gsm;
public GameModel(GameView view,GameStateManager gsm)
public GameModel(GameStateManager gsm)
{
this.gsm = gsm;
update = new Timer((int) framePerSecondUpdate, this);
update = new Timer(1000/30, this);
update.start();
for(int i = 1; i < ButtonHandler.getButtons().size(); i++){