diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java b/Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java index 21db5fbe50cac09f4e2693d2d071ffacaa28e2d5..21381eb0fd923ce657ddc2c8943c71d6b504f039 100644 --- a/Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java +++ b/Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java @@ -1,14 +1,14 @@ package arctic_nightmare; public class Eskimo extends Person { - public Eskimo(Field f, Game g) { - super(f, g); + public Eskimo(String name, Field f, Game g) { + super(name, f, g); maxTemp = 5; bodyTemp = 5; } - public Eskimo(Game g) { - super(g); + public Eskimo(String name, Game g) { + super(name, g); maxTemp = 5; bodyTemp = 5; } diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Explorer.java b/Arctic_Nigthmare/src/arctic_nightmare/Explorer.java index 3d8c2f12f026dd400d5e5428fc2fdeef48f282eb..fb1db9a31e061b2fe15be4d08318077522536a76 100644 --- a/Arctic_Nigthmare/src/arctic_nightmare/Explorer.java +++ b/Arctic_Nigthmare/src/arctic_nightmare/Explorer.java @@ -3,14 +3,14 @@ package arctic_nightmare; public class Explorer extends Person { - public Explorer(Field f, Game g) { - super(f, g); + public Explorer(String name, Field f, Game g) { + super(name, f, g); maxTemp = 4; bodyTemp = 4; } - public Explorer(Game g) { - super(g); + public Explorer(String name, Game g) { + super(name, g); maxTemp = 4; bodyTemp = 4; } diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Game.java b/Arctic_Nigthmare/src/arctic_nightmare/Game.java index 0673ba0b6109cb68d2f0cd1d61c72f072e770658..ac97e944a7dc4db27200fb1cc01f80876ad52f91 100644 --- a/Arctic_Nigthmare/src/arctic_nightmare/Game.java +++ b/Arctic_Nigthmare/src/arctic_nightmare/Game.java @@ -81,9 +81,9 @@ public class Game{ for(int i = 0; i < playernum; ++i) { Person newperson = null; if(i % 2 == 0) - newperson = new Eskimo(this); + newperson = new Eskimo("Fakename", this); else - newperson = new Explorer(board.getfield((i + 1) * 2), this); + newperson = new Explorer("Fakename", board.getfield((i + 1) * 2), this); players.add(newperson); if(board.getfield((i + 1) * 2).canAddPlayer()) board.getfield((i + 1) * 2).addPlayer(newperson); diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Logger.java b/Arctic_Nigthmare/src/arctic_nightmare/Logger.java index 36a664edd5aede46470305bac6e634f3bc124ccd..ff06372471d892d00f5f3ddac4a76f3b639db085 100644 --- a/Arctic_Nigthmare/src/arctic_nightmare/Logger.java +++ b/Arctic_Nigthmare/src/arctic_nightmare/Logger.java @@ -27,10 +27,7 @@ final public class Logger { try { fileoutput = new FileOutputStream(file); } catch (FileNotFoundException ex) { - Log(ex.toString(), false); - } catch (IOException ex) { - Log(ex.toString(), false); - } + Log(ex.toString(), false);} tabs = 0; } diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Person.java b/Arctic_Nigthmare/src/arctic_nightmare/Person.java index 1103351ca6e85f2653d6dd808c9d8cc5b4651f2c..922c7bebf010a009f084d18df2623287d3bcb337 100644 --- a/Arctic_Nigthmare/src/arctic_nightmare/Person.java +++ b/Arctic_Nigthmare/src/arctic_nightmare/Person.java @@ -26,9 +26,9 @@ public abstract class Person { ///Person konstruktorba kell Game mindenképpen - public Person(Field f, Game g) { + public Person(String name, Field f, Game g) { work = 0; - name = new String(); + this.name = name; field = f; items = new Vector<Item>(); game = g; @@ -36,9 +36,9 @@ public abstract class Person { id = idcounter++; } - public Person(Game g) { + public Person(String name, Game g) { work = 0; - name = new String(); + this.name = name; field = null; items = new Vector<Item>(); game = g;