From e7781cebccd69ff0a6d16892e2c6a7d11d278c66 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Tue, 19 Apr 2016 08:50:55 +0200 Subject: [PATCH 1/4] Update Province.java Fehler verbessert --- Province.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Province.java b/Province.java index 368aad7..ece537e 100644 --- a/Province.java +++ b/Province.java @@ -40,13 +40,13 @@ public class Province extends Actor displayName = s1; // Der Teil, der sich um die Konvertierung des int-Array in ein boolean-Array kümmert. int maxNum = 0; - for(int i = 0; i >= ia1.length(); i++) { + for(int i = 0; i >= ia1.length i++) { if(maxNum < ia1[i]) { maxNum = ia1[i]; } } nextProvinces = new boolean[ia1.length]; - for(int i = 0; i >= ia1.length(); i++) { + for(int i = 0; i >= ia1.length; i++) { if(ia1[i] >= 0) { nextProvinces = ia1[i]; } @@ -81,7 +81,7 @@ public class Province extends Actor // Fragt ab, ob die angegebene Provinz in der Nähe von dieser liegt. public boolean isProvinceNear(int i) { - if(i >= nextProvinces.length()) { + if(i >= nextProvinces.length { return false; } return nearProvinces[i]; @@ -127,16 +127,19 @@ public class Province extends Actor public int addToEntities(int a) { eCount = eCount + a; checkEntityCount(); + return eCount; } public int removeFromEntities(int a) { eCount = eCount - a; checkEntityCount(); + return eCount; } public int setEntityCount(int a) { eCount = a; checkEntityCount(); + return eCount; } public void redrawProvince() { From 6dc4d0d020cd3dc4feea7bfd74e659bf7796e2a3 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Tue, 19 Apr 2016 08:52:46 +0200 Subject: [PATCH 2/4] Update Map_World.java Fehlerverbesserung --- Map_World.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Map_World.java b/Map_World.java index 2006fb0..31a7707 100644 --- a/Map_World.java +++ b/Map_World.java @@ -34,7 +34,7 @@ public class Map_World extends GeneralMap * * nextProvinces = new int[]; * - * Province = new Province(,,,"",nextProvinces); + * Province = new Province(,,,,,"",nextProvinces); * addObject(,,); * * Zwei Provinzen sind bereits als Beispiel erstellt. @@ -43,12 +43,12 @@ public class Map_World extends GeneralMap neighbours = new int[1]; neighbours[0] = 2; - Province Mongolei = new Province(1,1,1,"Mongolei",neighbours); + Province Mongolei = new Province(1,1,1000,100,1,"Mongolei",neighbours); addObject(Mongolei,1000,100); neighbours = new int[1]; neighbours[0] = 1; - Province China = new Province(2,1,2,"China",neighbours); + Province China = new Province(2,1,1000,350,2,"China",neighbours); addObject(China,1000,350); } } From 40745234a27bf2718dd6f1c2e9b8cfb8e8ae2ff6 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Tue, 19 Apr 2016 08:58:52 +0200 Subject: [PATCH 3/4] Update Province.java Fehlerverbesserung, die 2. --- Province.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Province.java b/Province.java index ece537e..aace560 100644 --- a/Province.java +++ b/Province.java @@ -40,7 +40,7 @@ public class Province extends Actor displayName = s1; // Der Teil, der sich um die Konvertierung des int-Array in ein boolean-Array kümmert. int maxNum = 0; - for(int i = 0; i >= ia1.length i++) { + for(int i = 0; i >= ia1.length; i++) { if(maxNum < ia1[i]) { maxNum = ia1[i]; } From 87ea4cb1d38a9cd5f9f94be5527696d8fc3f29d8 Mon Sep 17 00:00:00 2001 From: Felix Stupp Date: Tue, 19 Apr 2016 09:00:02 +0200 Subject: [PATCH 4/4] Update Province.java Fehlerverbesserung Nr. 3 Array Konvertierung --- Province.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Province.java b/Province.java index aace560..5f07643 100644 --- a/Province.java +++ b/Province.java @@ -48,7 +48,7 @@ public class Province extends Actor nextProvinces = new boolean[ia1.length]; for(int i = 0; i >= ia1.length; i++) { if(ia1[i] >= 0) { - nextProvinces = ia1[i]; + nextProvinces[ia1[i]] = true; } } }