aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-04-16 01:22:09 +0200
committerPacien TRAN-GIRARD2014-04-16 01:22:09 +0200
commita4a150d159291fdabdde45e5e034cbda3a63ba24 (patch)
treea0541e733e9ebd9d4ebef4473aecbe9d0cb5c177
parentb9ced312ad75ae0bb1d0a50dadf1f0791ad6b0fd (diff)
downloadesieequest-a4a150d159291fdabdde45e5e034cbda3a63ba24.tar.gz
Fix typo
-rw-r--r--src/esieequest/model/Game.java2
-rw-r--r--src/esieequest/model/entities/Player.java7
2 files changed, 8 insertions, 1 deletions
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java
index 8de81b2..d1607a9 100644
--- a/src/esieequest/model/Game.java
+++ b/src/esieequest/model/Game.java
@@ -219,7 +219,7 @@ public class Game {
219 this.rooms.get("OffscriptItemsStorageroom").getItems().putItem("Edgeless Safety Cube", new Item("An Edgeless Safety Cube.", 5, true)); 219 this.rooms.get("OffscriptItemsStorageroom").getItems().putItem("Edgeless Safety Cube", new Item("An Edgeless Safety Cube.", 5, true));
220 this.rooms.get("OffscriptItemsStorageroom").getItems().putItem("Portable Black-hole", new Item("A portable black-hole that has a negative mass.", -10, true)); 220 this.rooms.get("OffscriptItemsStorageroom").getItems().putItem("Portable Black-hole", new Item("A portable black-hole that has a negative mass.", -10, true));
221 221
222 this.rooms.get("OffscriptTeleportationBeamerroom").getItems().putItem("Portable Quantum Tunelling Device", new Beamer("Basically a teleporter.")); 222 this.rooms.get("OffscriptTeleportationBeamerroom").getItems().putItem("Portable Quantum Tunneling Device", new Beamer("Basically a teleporter."));
223 223
224 final KeyCard keyCard = new KeyCard("A KeyCard that opens a locked door."); 224 final KeyCard keyCard = new KeyCard("A KeyCard that opens a locked door.");
225 final LockedDoor lockedDoorLock = (LockedDoor) this.rooms.get("OffscriptLock").getExit("north"); 225 final LockedDoor lockedDoorLock = (LockedDoor) this.rooms.get("OffscriptLock").getExit("north");
diff --git a/src/esieequest/model/entities/Player.java b/src/esieequest/model/entities/Player.java
index 4190eaa..841d6a6 100644
--- a/src/esieequest/model/entities/Player.java
+++ b/src/esieequest/model/entities/Player.java
@@ -22,6 +22,13 @@ public class Player {
22 private int nbSteps; 22 private int nbSteps;
23 private int maxNbSteps; 23 private int maxNbSteps;
24 24
25 /**
26 * Creates a new player.
27 *
28 * @param maxCarryWeight
29 * the maximum total weight of the items that the player can
30 * carry
31 */
25 public Player(final int maxCarryWeight) { 32 public Player(final int maxCarryWeight) {
26 this.currentRoom = null; 33 this.currentRoom = null;
27 this.previousRooms = new Stack<Room>(); 34 this.previousRooms = new Stack<Room>();