From 9e3b5e71be5439495638228a8ca74b1f58491201 Mon Sep 17 00:00:00 2001
From: CsellarAndras <andras.csellar@nokia.com>
Date: Fri, 24 Apr 2020 21:19:57 +0200
Subject: [PATCH] Added again name argument to person constructor
---
Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java | 8 ++++----
Arctic_Nigthmare/src/arctic_nightmare/Explorer.java | 8 ++++----
Arctic_Nigthmare/src/arctic_nightmare/Game.java | 4 ++--
Arctic_Nigthmare/src/arctic_nightmare/Logger.java | 5 +----
Arctic_Nigthmare/src/arctic_nightmare/Person.java | 8 ++++----
5 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java b/Arctic_Nigthmare/src/arctic_nightmare/Eskimo.java
index 21db5fb..21381eb 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 3d8c2f1..fb1db9a 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 0673ba0..ac97e94 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 36a664e..ff06372 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 1103351..922c7be 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;
--
GitLab