Fix arg order for passwords.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index e75cbe9001f495a0177d65ee0859d148486e897f..85ec5d31b2d4c3c40ae1bf0ee0a3f9e877e00167 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, yx, msg, pw=None, connection_id=None):
+    if connection_id and 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 = 'yx_tuple:nonneg string string'
 
-def cmd_PORTAL(game, yx, msg, connection_id):
+def cmd_PORTAL(game, yx, msg, pw=None, connection_id=None):
+    if connection_id and 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 = 'yx_tuple:nonneg string string'
 
 def cmd_GET_ANNOTATION(game, yx, connection_id):
     annotation = '(none)';
@@ -105,3 +109,11 @@ def cmd_MAP(game, geometry, size):
     map_geometry_class = globals()['MapGeometry' + geometry]
     game.new_world(map_geometry_class(size))
 cmd_MAP.argtypes = 'string:map_geometry yx_tuple:pos'
+
+def cmd_MAP_CONTROL_LINE(game, y, line):
+    game.map_control.set_line(y, line)
+cmd_MAP_CONTROL_LINE.argtypes = 'int:nonneg string'
+
+def cmd_MAP_CONTROL_PW(game, tile_class, password):
+    game.map_control_passwords[tile_class] = password
+cmd_MAP_CONTROL_PW.argtypes = 'char string'