Add some safeguards against stupid map protection decisions.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index c0795991666f941cb85ecfe11d446b61d8dab9f8..843bcfe844ca509b5f3ee354f192e62df0affa91 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -106,10 +106,13 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
         raise GameError('need to be logged in for this')
     if not game.sessions[connection_id]['status'] == 'admin':
         raise GameError('need to be admin for this')
+    if not control_char in game.map_control_passwords.keys():
+        raise GameError('no password set for this tile class')
     big_yx, little_yx = player.fov_stencil.source_yxyx(yx)
     map_control = game.get_map(big_yx, 'control')
     map_control[little_yx] = control_char
-cmd_SET_TILE_CONTROL.argtypes = 'yx:nonneg char'
+    game.changed = True
+cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
 
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
     player = game.get_player(connection_id)
@@ -117,6 +120,8 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
         raise GameError('need to be logged in for this')
     if not game.sessions[connection_id]['status'] == 'admin':
         raise GameError('need to be admin for this')
+    if tile_class == '.':
+        raise GameError('tile class "." must remain unprotected')
     game.map_control_passwords[tile_class] = password
     game.changed = True
 cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'