aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-05-24 22:13:44 +0200
committerPacien TRAN-GIRARD2014-05-24 22:13:44 +0200
commit8fed210dc4b63bc3b7170e8877eb2ad43c4a2e2e (patch)
tree07cbb6c13d78d8d08f670ef4ec6e132e76ffe5a8
parent20871d37e2995c7037ec5a6d359b0f2859df3934 (diff)
downloadesieequest-8fed210dc4b63bc3b7170e8877eb2ad43c4a2e2e.tar.gz
Update inventory for new games
-rw-r--r--src/esieequest/controller/commands/LoadCommand.java2
-rw-r--r--src/esieequest/controller/commands/NewCommand.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/esieequest/controller/commands/LoadCommand.java b/src/esieequest/controller/commands/LoadCommand.java
index 26e18e2..c15e6ba 100644
--- a/src/esieequest/controller/commands/LoadCommand.java
+++ b/src/esieequest/controller/commands/LoadCommand.java
@@ -48,12 +48,12 @@ public class LoadCommand implements Executable {
48 return; 48 return;
49 } 49 }
50 50
51 view.enableInput();
52 view.updateQuest(game.getPlayer().getCurrentQuest()); 51 view.updateQuest(game.getPlayer().getCurrentQuest());
53 view.updateInventory(game.getPlayer().getInventory()); 52 view.updateInventory(game.getPlayer().getInventory());
54 view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer() 53 view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
55 .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer() 54 .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
56 .canGoBack()); 55 .canGoBack());
56 view.enableInput();
57 57
58 } 58 }
59} 59}
diff --git a/src/esieequest/controller/commands/NewCommand.java b/src/esieequest/controller/commands/NewCommand.java
index 571b4a9..8967820 100644
--- a/src/esieequest/controller/commands/NewCommand.java
+++ b/src/esieequest/controller/commands/NewCommand.java
@@ -30,7 +30,7 @@ public class NewCommand implements Executable {
30 @Override 30 @Override
31 public void call() { 31 public void call() {
32 view.updateQuest(game.getPlayer().getCurrentQuest()); 32 view.updateQuest(game.getPlayer().getCurrentQuest());
33 33 view.updateInventory(game.getPlayer().getInventory());
34 view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer() 34 view.updateLocation(game.getPlayer().getCurrentRoom(), game.getPlayer()
35 .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer() 35 .getCurrentDirection(), game.getPlayer().getCurrentSide(), game.getPlayer()
36 .canGoBack()); 36 .canGoBack());