diff options
Diffstat (limited to 'src/esieequest/model/Game.java')
-rw-r--r-- | src/esieequest/model/Game.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/esieequest/model/Game.java b/src/esieequest/model/Game.java index ed7c3df..668a7f9 100644 --- a/src/esieequest/model/Game.java +++ b/src/esieequest/model/Game.java | |||
@@ -1,6 +1,5 @@ | |||
1 | package esieequest.model; | 1 | package esieequest.model; |
2 | 2 | ||
3 | import java.util.Observable; | ||
4 | import java.util.HashMap; | 3 | import java.util.HashMap; |
5 | 4 | ||
6 | /** | 5 | /** |
@@ -10,7 +9,7 @@ import java.util.HashMap; | |||
10 | * | 9 | * |
11 | * @version February 2014 | 10 | * @version February 2014 |
12 | */ | 11 | */ |
13 | public class Game extends Observable { | 12 | public class Game { |
14 | 13 | ||
15 | private boolean aRunning; | 14 | private boolean aRunning; |
16 | private HashMap<String, Room> aRooms; | 15 | private HashMap<String, Room> aRooms; |
@@ -168,8 +167,6 @@ public class Game extends Observable { | |||
168 | 167 | ||
169 | public void setRunning(final boolean pState) { | 168 | public void setRunning(final boolean pState) { |
170 | this.aRunning = pState; | 169 | this.aRunning = pState; |
171 | this.setChanged(); | ||
172 | this.notifyObservers("state"); | ||
173 | } | 170 | } |
174 | 171 | ||
175 | public boolean isRunning() { | 172 | public boolean isRunning() { |
@@ -178,14 +175,10 @@ public class Game extends Observable { | |||
178 | 175 | ||
179 | public void goToRoom(final Room pRoom) { | 176 | public void goToRoom(final Room pRoom) { |
180 | this.aCurrentRoom = pRoom; | 177 | this.aCurrentRoom = pRoom; |
181 | this.setChanged(); | ||
182 | this.notifyObservers("room"); | ||
183 | } | 178 | } |
184 | 179 | ||
185 | public void goToRoom(final String pRoomName) { | 180 | public void goToRoom(final String pRoomName) { |
186 | this.aCurrentRoom = this.aRooms.get(pRoomName); | 181 | this.aCurrentRoom = this.aRooms.get(pRoomName); |
187 | this.setChanged(); | ||
188 | this.notifyObservers("room"); | ||
189 | } | 182 | } |
190 | 183 | ||
191 | public Room getRoomExit(final String pDirection) { | 184 | public Room getRoomExit(final String pDirection) { |