From 3d807abb83f6bbbdcd380b43c808aa5e475b4fd4 Mon Sep 17 00:00:00 2001
From: Zocker1999NET <zocker.net@live.de>
Date: Mon, 25 Jul 2016 19:01:04 +0200
Subject: [PATCH] =?UTF-8?q?Umsetzung=20#107=20*=20Neue=20Methoden=20getTex?=
 =?UTF-8?q?tCol()=20&=20getTransBackCol(),=20welche=20nun=20passend=20f?=
 =?UTF-8?q?=C3=BCr=20den=20aktuellen=20Spieler=20die=20Text-=20und=20Hinte?=
 =?UTF-8?q?rgrundfarbe=20der=20Textobjekte=20festlegt=20*=20Einsetzen=20di?=
 =?UTF-8?q?eser=20Methoden=20in=20die=20bisherige=20Darstellungsmethode=20?=
 =?UTF-8?q?*=20Verschnellerung=20der=20vielen=20Redraws=20bei=20dem=20swit?=
 =?UTF-8?q?ch=20case=20*=20Entfernung=20der=20nun=20unn=C3=B6tigen=20Metho?=
 =?UTF-8?q?de=20redrawArrow()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Player.java | 32 +++++++++++---------------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/Player.java b/Player.java
index 284b47c..a91dc91 100644
--- a/Player.java
+++ b/Player.java
@@ -223,6 +223,14 @@ public class Player extends Actor
 
     }
 
+    private Color getTextCol() {
+        return (getWorld().getCurrentPlayerID() == id) ? new Color(255,255,255) : new Color(0,0,0);
+    }
+
+    private Color getTransBackCol() {
+        return (getWorld().getCurrentPlayerID() == id) ? new Color(0.0f,0.0f,0.0f,0.5f) : new Color(1.0f,1.0f,1.0f,0.5f);
+    }
+
     public void redrawPlayer()
     {
         int textSize = 20;
@@ -231,8 +239,8 @@ public class Player extends Actor
             n = "leererSpieler";
         }
         GreenfootImage statistics = new GreenfootImage(137,120);   
-        GreenfootImage Name = new GreenfootImage(n,textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));        
-        statistics.drawImage(Name,0,0);
+        GreenfootImage name = new GreenfootImage(n,textSize,getTextCol(),getTransBackCol());        
+        statistics.drawImage(name,0,0);
 
         setImage(statistics);
         oDecide(statistics,textSize);        
@@ -241,45 +249,27 @@ public class Player extends Actor
     private void oDecide(GreenfootImage statistics,int textSize)
     {
         GreenfootImage flag = new GreenfootImage("images\\BlaueArmee.jpg");
-        redraw(statistics,flag,textSize);
         switch(color)
         {
             case 2:
             flag = new GreenfootImage("images\\BlaueArmee.jpg");
-
-            redraw(statistics,flag,textSize);
             break;
             case 5:
             flag = new GreenfootImage("images\\GelbeArmee.jpg");
-
-            redraw(statistics,flag,textSize);
             break;
             case 6:
             flag = new GreenfootImage("images\\LilaArmee.jpg");
-
-            redraw(statistics,flag,textSize);
             break;
             case 4:
             flag = new GreenfootImage("images\\RoteArmee.jpg");
-
-            redraw(statistics,flag,textSize);
             break;
             case 1:
             flag = new GreenfootImage("images\\SchwarzeArmee.jpg");
-
-            redraw(statistics,flag,textSize);
             break;
             case 3:
             flag = new GreenfootImage("images\\GrueneArmee.jpg");
-            redrawArrow(statistics,flag,textSize);
             break;
         }
-
-    }
-
-    private void redrawArrow(GreenfootImage statistics,GreenfootImage flag, int textSize)
-    {
-        // redraw(statistics,flag,textSize);
         redraw(statistics,flag,textSize);
     }
 
@@ -287,7 +277,7 @@ public class Player extends Actor
     {
         flag.scale(137,83);
         statistics.drawImage(flag,0,textSize);
-        GreenfootImage playerStatistics = new GreenfootImage(stats[0] + "||" + stats[1] + "||" + stats[2] + "||" +stats[3] + "||" + stats[4] + "||" + stats[5],textSize,new Color(0,0,0),new Color(1.0f,1.0f,1.0f,0.5f));
+        GreenfootImage playerStatistics = new GreenfootImage(stats[0] + "||" + stats[1] + "||" + stats[2] + "||" +stats[3] + "||" + stats[4] + "||" + stats[5],textSize,getTextCol(),getTransBackCol());
         statistics.drawImage(playerStatistics, 0, 103);
 
         setImage(statistics);