From 56597fee590e1e260b56b683f600d472cc8af779 Mon Sep 17 00:00:00 2001
From: toksikk <sykikk+github@gmail.com>
Date: Fri, 30 Jan 2015 13:51:35 +0100
Subject: [PATCH] =?UTF-8?q?qweq=20we=20qwe=20qwe=20q#=20Bitte=20geben=20Si?=
 =?UTF-8?q?e=20eine=20Commit-Beschreibung=20f=C3=BCr=20Ihre=20=C3=84nderun?=
 =?UTF-8?q?gen=20ein.=20Zeilen,?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/de/heatup/highscore/ScoreEntry.java   |  2 +-
 .../de/heatup/mapengine/CollisionHandler.java |  4 ++-
 HeatUp/src/de/heatup/ui/StatusPanelAdder.java | 30 +++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/HeatUp/src/de/heatup/highscore/ScoreEntry.java b/HeatUp/src/de/heatup/highscore/ScoreEntry.java
index 9cf08ff..acecc1c 100644
--- a/HeatUp/src/de/heatup/highscore/ScoreEntry.java
+++ b/HeatUp/src/de/heatup/highscore/ScoreEntry.java
@@ -11,7 +11,7 @@ public class ScoreEntry implements Serializable {
 	
 	public ScoreEntry() {
 		name = "default";
-		score = 2342;
+		score = 1;
 	}
 	
 	public ScoreEntry(String name, int score) {
diff --git a/HeatUp/src/de/heatup/mapengine/CollisionHandler.java b/HeatUp/src/de/heatup/mapengine/CollisionHandler.java
index 1ff5cb3..9aa516d 100644
--- a/HeatUp/src/de/heatup/mapengine/CollisionHandler.java
+++ b/HeatUp/src/de/heatup/mapengine/CollisionHandler.java
@@ -7,6 +7,8 @@ import de.heatup.logging.Logger;
 import de.heatup.objects.Player;
 import de.heatup.objects.PowerUp;
 import de.heatup.objects.PowerUpHandler;
+import de.heatup.ui.Main;
+import de.heatup.ui.menu.MenuPanel;
 
 public class CollisionHandler {
 	private static ArrayList<Player> movingObjects = new ArrayList<Player>();
@@ -52,7 +54,7 @@ public class CollisionHandler {
 	public static void tick() {
 		for (int i=1; i<movingObjects.size();i++) {
 			if (movingObjects.get(0).getGridLocation().x== movingObjects.get(i).getGridLocation().x && movingObjects.get(0).getGridLocation().y == movingObjects.get(i).getGridLocation().y) {
-//				Logger.write("COLLISION WITH ENEMY");
+				
 			}
 		}
 	}
diff --git a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
index 788322d..14db3bd 100644
--- a/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
+++ b/HeatUp/src/de/heatup/ui/StatusPanelAdder.java
@@ -9,13 +9,17 @@ import java.awt.Font;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.util.Scanner;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
 import javax.swing.SwingConstants;
 
+import de.heatup.highscore.ScoreEntry;
 import de.heatup.logging.Logger;
+import de.heatup.ui.menu.MenuPanel;
+import de.heatup.ui.menu.SaveScorePanel;
 import de.heatup.ui.statusPanel.Score;
 import de.heatup.ui.statusPanel.Timer;
 
@@ -139,6 +143,32 @@ public class StatusPanelAdder{
 		}
 		if (tempBar.getValue()==110){
 			Logger.write(Score.endScore()+"");
+			Main.pause();
+			MenuPanel.gameExists=1;
+			int i;
+			// end gameExists
+			i =1;
+			for (ScoreEntry se  : PanelBuilder.getMapEngine().getHighscoreHandler().getHighscores(
+					PanelBuilder.getMapEngine().getHighscoreHandler().getCurrentMapHash())) {
+				System.out.println(i+". "+se.getName() + " " +se.getScore());
+				i++;
+			}
+			System.out.print("Ende. Highscore: " + Score.endScore() + " Bitte Name eintippen: ");
+			Scanner s = new Scanner(System.in);
+			String name = s.nextLine();
+			
+			
+			PanelBuilder.getMapEngine().getHighscoreHandler().setHighscore(
+					PanelBuilder.getMapEngine().getHighscoreHandler().getCurrentMapHash(), name, Score.endScore());
+			PanelBuilder.getMapEngine().getHighscoreHandler().saveHighscores();
+			i =1;
+			for (ScoreEntry se  : PanelBuilder.getMapEngine().getHighscoreHandler().getHighscores(
+					PanelBuilder.getMapEngine().getHighscoreHandler().getCurrentMapHash())) {
+				
+				System.out.println(i+". "+se.getName() + " " +se.getScore());
+				i++;
+			}
+			System.exit(0);
 		}
 		/*
 		 * Änderung der Farbe der TempBar