From 0525163195d8564b3e5aacd07c0627afc41ceb87 Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Mon, 8 Jun 2015 13:45:28 +0200
Subject: [PATCH] GamePlay fixes

---
 control/GameControl.java       | 33 ++++++++++++++++-----------------
 model/gameState/PlayState.java | 10 ++++++----
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/control/GameControl.java b/control/GameControl.java
index c7de9d5..42bdbb4 100644
--- a/control/GameControl.java
+++ b/control/GameControl.java
@@ -2,8 +2,8 @@ package control;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Timer;
-import java.util.TimerTask;
+
+import javax.swing.Timer;
 
 import model.GameModel;
 import view.GameView;
@@ -26,20 +26,20 @@ public class GameControl implements JoystickListener, ButtonListener, ActionList
 		this.view = view;
 		this.gsm = gsm;
 		view.setIgnoreRepaint(true);
-//		update = new Timer(1000/60,this);
-//		update.start();
-		Timer update = new Timer();
-		update.schedule(new TimerTask() {
-			
-			@Override
-			public void run() {
-				long currentTime = System.currentTimeMillis();
-				model.update(currentTime - lastTime);
-				lastTime = currentTime;
-				view.repaint();			
-				System.out.println("Test");
-			}
-		}, 0,1000/120);
+		update = new Timer(1000/60,this);
+		update.start();
+//		Timer update = new Timer();
+//		update.schedule(new TimerTask() {
+//			
+//			@Override
+//			public void run() {
+//				long currentTime = System.currentTimeMillis();
+//				model.update(currentTime - lastTime);
+//				lastTime = currentTime;
+//				view.repaint();			
+//				System.out.println("Test");
+//			}
+//		}, 0,1000/120);
 	}
 
 	@Override
@@ -66,5 +66,4 @@ public class GameControl implements JoystickListener, ButtonListener, ActionList
 		lastTime = currentTime;
 		view.repaint();				
 	}
-
 }
diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java
index 5a71a1a..1bb3a71 100644
--- a/model/gameState/PlayState.java
+++ b/model/gameState/PlayState.java
@@ -41,16 +41,18 @@ public class PlayState extends GameState {
 		super(gsm, sh);
 		infoPanel = new InfoPanel(0, 0);
 		area = new PlayArea(256, 1024, 1024, 125);
-		// for(int index = 0; index < 8; index++){
-		// addEnemy(index, GameModel.colors[index % 6]);
-		// }
-		//
 		player = new Player(1280 - 1024 + 1024 / 2, 1024 / 2);
 		stroke = new BasicStroke(sizeOfEnemy, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
 	}
 
 	@Override
 	public void init() {
+		
+		lifePoints = 100;
+		currentScore = 0;
+		comboScore = 0;
+		oldProgress = 0 ;
+		
 		try {
 			Thread.sleep(2000);
 		} catch (InterruptedException e) {