Password-protect tiles from portal and annotation editing, too.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index f8c8e3aa5aa139d3ece7746abe37162ed7ad58f9..f6744aca92e037d132effc9ebd0b8dcae9e05d13 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -72,23 +72,27 @@ def cmd_TURN(game, n):
     game.turn = n
 cmd_TURN.argtypes = 'int:nonneg'
 
-def cmd_ANNOTATE(game, yx, msg, connection_id):
+def cmd_ANNOTATE(game, pw, yx, msg, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
+        raise GameError('wrong password for tile')
     if msg == ' ':
         if yx in game.annotations:
             del game.annotations[yx]
     else:
         game.annotations[yx] = msg
     game.changed = True
-cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string'
+cmd_ANNOTATE.argtypes = 'string yx_tuple:nonneg string'
 
-def cmd_PORTAL(game, yx, msg, connection_id):
+def cmd_PORTAL(game, pw, yx, msg, connection_id):
+    if not game.can_do_tile_with_pw(yx, pw):
+        raise GameError('wrong password for tile')
     if msg == ' ':
         if yx in game.portals:
             del game.portals[yx]
     else:
         game.portals[yx] = msg
     game.changed = True
-cmd_PORTAL.argtypes = 'yx_tuple:nonneg string'
+cmd_PORTAL.argtypes = 'string yx_tuple:nonneg string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';