Fix weird BECOME_ADMIN code.

[plomrogue2] / plomrogue / commands.py

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index aed5830b5d64c6ea1615fdb57210f8229b3ab50d..ca5c37c60ab635056cfd0bbdd11b662cc87232b7 100644 (file)
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -68,7 +68,7 @@ def cmd_LOGIN(game, nick, connection_id):
 cmd_LOGIN.argtypes = 'string'
 
 def cmd_BECOME_ADMIN(game, password, connection_id):
-    player = game.thing_types['Player'](game)
+    player = game.get_player(connection_id)
     if not player:
         raise GameError('need to be logged in for this')
     if password in game.admin_passwords:
@@ -92,7 +92,7 @@ def cmd_SET_TILE_CONTROL(game, yx, control_char, connection_id):
     map_control = game.get_map(big_yx, 'control')
     map_control[little_yx] = control_char
     game.changed = True
-    game.record_fov_change((big_yx, little_yx))
+    game.record_change((big_yx, little_yx), 'fov')
 cmd_SET_TILE_CONTROL.argtypes = 'yx_tuple:nonneg char'
 
 def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
@@ -106,8 +106,7 @@ def cmd_THING_PROTECTION(game, thing_id, protection_char, connection_id):
         raise GameError('thing of ID %s not found' % thing_id)
     t.protection = protection_char
     game.changed = True
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change(t.position)
+    game.record_change(t.position, 'other')
 cmd_THING_PROTECTION.argtypes = 'int:pos char'
 
 def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
@@ -135,8 +134,7 @@ def cmd_NICK(game, nick, connection_id):
     t.name = nick
     game.io.send('CHAT ' + quote(old_nick + ' renamed themselves to ' + nick))
     game.changed = True
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change(t.position)
+    game.record_change(t.position, 'other')
 cmd_NICK.argtypes = 'string'
 
 def cmd_GET_GAMESTATE(game, connection_id):
@@ -183,8 +181,7 @@ def cmd_ANNOTATE(game, yx, msg, pw, connection_id):
         if big_yx not in game.annotations:
             game.annotations[big_yx] = {}
         game.annotations[big_yx][little_yx] = msg
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change([big_yx, little_yx])
+    game.record_change([big_yx, little_yx], 'other')
     game.changed = True
 cmd_ANNOTATE.argtypes = 'yx_tuple:nonneg string string'
 
@@ -203,8 +200,7 @@ def cmd_PORTAL(game, yx, msg, pw, connection_id):
         if big_yx not in game.portals:
             game.portals[big_yx] = {}
         game.portals[big_yx][little_yx] = msg
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change([big_yx, little_yx])
+    game.record_change([big_yx, little_yx], 'other')
     game.changed = True
 cmd_PORTAL.argtypes = 'yx_tuple:nonneg string string'
 
@@ -268,8 +264,7 @@ def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
     else:
         t.name = name
     game.changed = True
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change(t.position)
+    game.record_change(t.position, 'other')
 cmd_THING_NAME.argtypes = 'int:pos string string'
 
 def cmd_GOD_THING_NAME(game, thing_id, name):
@@ -292,9 +287,7 @@ def cmd_THING_DOOR_CLOSED(game, thing_id):
         raise GameError('thing of ID %s not found' % thing_id)
     if not t.type_ == 'Door':
         raise GameError('thing of ID %s not door' % thing_id)
-    t.blocking = True
-    t.portable = False
-    t.thing_char = '#'
+    t.close()
 cmd_THING_DOOR_CLOSED.argtypes = 'int:pos'
 
 def cmd_THING_MUSICPLAYER_SETTINGS(game, thing_id, playing, index, repeat):
@@ -343,8 +336,7 @@ def cmd_PLAYER_FACE(game, face, connection_id):
         raise GameError('wrong face string length')
     game.faces[t.name] = face
     game.changed = True
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change(t.position)
+    game.record_change(t.position, 'other')
 cmd_PLAYER_FACE.argtypes = 'string'
 
 def cmd_PLAYER_HAT(game, hat, connection_id):
@@ -363,8 +355,7 @@ def cmd_PLAYER_HAT(game, hat, connection_id):
                             % (c, legal_chars))
     game.hats[t.name] = hat
     game.changed = True
-    # FIXME: pseudo-FOV-change actually
-    game.record_fov_change(t.position)
+    game.record_change(t.position, 'other')
 cmd_PLAYER_HAT.argtypes = 'string'
 
 def cmd_GOD_PLAYER_FACE(game, name, face):