X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Fgameboard.py;h=dd0861ea0b4005cafa10e1282bee877208c7546e;hb=2a46865fc69e2e90e28bc13255a762279e7a1b29;hp=f3e6f58567ecd962db71cb9c356c3b34ec32a561;hpb=ee043bf16a47565d7781bd8a357f803a98bd8a4b;p=naja.git

diff --git a/naja/gameboard.py b/naja/gameboard.py
index f3e6f58..dd0861e 100644
--- a/naja/gameboard.py
+++ b/naja/gameboard.py
@@ -2,7 +2,7 @@ from random import choice
 
 from naja.constants import(
     BITS, DIRECTION_BITS, CONDITION_BITS, PLAYER_DEFAULTS,
-    MOVE, ACT)
+    MOVE, ACT, EXAMINE)
 from naja.player import Player
 from naja import actions
 
@@ -104,12 +104,13 @@ class GameBoard(object):
         location = LocationCard.new_location(choice(self.locations).copy())
         self.board_locations[position] = location
 
-    def change_mode(self):
+    def change_mode(self, new_mode):
         """Advance to the next mode"""
-        if self.player_mode == MOVE:
-            self.player_mode = ACT
-        elif self.player_mode == ACT:
-            self.player_mode = MOVE
+        if new_mode == self.player_mode:
+            raise RuntimeError("Inconsistent state. Setting mode %s to itself"
+                               % self.player_mode)
+        elif new_mode in (MOVE, ACT, EXAMINE):
+            self.player_mode = new_mode
         else:
             raise RuntimeError("Illegal player mode %s" % self.player_mode)