Whitespace riddance and some quote bug fixes.

[plomrogue2-experiments] / new2 / plomrogue / game.py

diff --git a/new2/plomrogue/game.py b/new2/plomrogue/game.py
index 2202343d2bf61bc2fd63c5467ae4fb373bf7f20e..c89d2c6cfddf80c3d30bca0abbe9dbabaa9e1d16 100755 (executable)
--- a/new2/plomrogue/game.py
+++ b/new2/plomrogue/game.py
@@ -6,7 +6,7 @@ from plomrogue.commands import (cmd_ALL, cmd_LOGIN, cmd_QUERY, cmd_PING,
                                 cmd_ANNOTATE, cmd_PORTAL, cmd_GET_GAMESTATE)
 from plomrogue.io import GameIO
 from plomrogue.misc import quote
-from plomrogue.things import Thing, ThingPlayer 
+from plomrogue.things import Thing, ThingPlayer
 from plomrogue.mapping import YX, MapGeometrySquare, Map
 
 
@@ -14,7 +14,6 @@ from plomrogue.mapping import YX, MapGeometrySquare, Map
 class GameBase:
 
     def __init__(self):
-        pass
         self.turn = 0
         self.things = []
 
@@ -87,7 +86,7 @@ class Game(GameBase):
         def send_thing(thing):
             self.io.send('THING_POS %s %s' % (thing.id_, t.position))
             if hasattr(thing, 'nickname'):
-                self.io.send('THING_NAME %s %s' % (thing.id_, t.nickname))
+                self.io.send('THING_NAME %s %s' % (thing.id_, quote(t.nickname)))
 
 
         self.io.send('TURN ' + str(self.turn))
@@ -95,7 +94,7 @@ class Game(GameBase):
             send_thing(t)
         self.io.send('MAP %s %s' % (self.map_geometry.size, quote(self.map.terrain)))
         for yx in self.portals:
-            self.io.send('PORTAL %s %s' % (yx, self.portals[yx]))
+            self.io.send('PORTAL %s %s' % (yx, quote(self.portals[yx])))
         self.io.send('GAME_STATE_COMPLETE')
 
     def run_tick(self):