X-Git-Url: https://plomlompom.com/repos/feed.xml?a=blobdiff_plain;f=plomrogue%2Fcommands.py;h=026f99603de4b90562c1d4f1d639481a3b3bddaf;hb=7fc75c298c5e54159bc86d5841ee9feab2fc64d0;hp=8b1a1b99d58b54505c1a3c89c5752b11f20481cb;hpb=74c0ec0247f058b977996f9e1e2d696f3d2d162b;p=plomrogue2

diff --git a/plomrogue/commands.py b/plomrogue/commands.py
index 8b1a1b9..026f996 100644
--- a/plomrogue/commands.py
+++ b/plomrogue/commands.py
@@ -36,11 +36,15 @@ def cmd_SPAWN_POINT(game, big_yx, little_yx):
 cmd_SPAWN_POINT.argtypes = 'yx_tuple yx_tuple:nonneg'
 
 def cmd_LOGIN(game, nick, connection_id):
+    nick = nick.strip()
+    if len(nick) == 0:
+        raise GameError('empty name')
     for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         raise GameError('name already in use')
     if game.get_player(connection_id):
         raise GameError('cannot log in twice')
     t = game.add_thing('Player', game.spawn_point)
+    t.name = nick
     t.thing_char = game.get_next_player_char()
     game.sessions[connection_id] = {
         'thing_id': t.id_,
@@ -48,7 +52,6 @@ def cmd_LOGIN(game, nick, connection_id):
     }
     game.io.send('PLAYER_ID %s' % t.id_, connection_id)
     game.io.send('LOGIN_OK', connection_id)
-    t.name = nick
     game.io.send('CHAT ' + quote(t.name + ' entered the map.'))
     for s in [s for s in game.things
               if s.type_ == 'SpawnPoint' and s.name == t.name]:
@@ -113,6 +116,9 @@ def cmd_SET_MAP_CONTROL_PASSWORD(game, tile_class, password, connection_id):
 cmd_SET_MAP_CONTROL_PASSWORD.argtypes = 'char string'
 
 def cmd_NICK(game, nick, connection_id):
+    nick = nick.strip()
+    if len(nick) == 0:
+        raise GameError('empty name')
     for t in [t for t in game.things if t.type_ == 'Player' and t.name == nick]:
         raise GameError('name already in use')
     t = game.get_player(connection_id)
@@ -246,7 +252,13 @@ def cmd_THING_NAME(game, thing_id, name, pw, connection_id):
         raise GameError('thing of ID %s not found' % thing_id)
     if not game.can_do_thing_with_pw(t, pw):
         raise GameError('wrong password for thing')
-    t.name = name
+    if name == ' ':
+        if hasattr(t.__class__, 'name'):
+            raise GameError('cannot un-name things of this type')
+        if hasattr(t, 'name'):
+            del t.name
+    else:
+        t.name = name
     game.changed = True
     # FIXME: pseudo-FOV-change actually
     game.record_fov_change(t.position)