laneya

commit

8e11884ec9d968e169948323744a943e879cdb94

parent

25d1c2c972a4f3d894acd794998984ed71285e37

Author

Tobias Bengfort <tobias.bengfort@gmx.net>

Date

2015-04-08 06:32

Fixup merge

Diffstat

2 files changed, 2 insertions, 2 deletions

diff --git a/laneya/client.py b/laneya/client.py

@@ -14,7 +14,7 @@ class Client(protocol.ClientProtocolFactory):
   14    14         self.sprites = {}
   15    15 
   16    16     def connection_made(self):
   17    -1         self.sendRequest('get_map', map_id='example_map')\
   -1    17         self.send_request('get_map', map_id='example_map')\
   18    18             .then(lambda response: self.render_floor(response['data']))
   19    19 
   20    20     def render_floor(self, data):

diff --git a/laneya/map.py b/laneya/map.py

@@ -161,7 +161,7 @@ class Map(object):
  161   161             sprite.x += dx
  162   162             sprite.y += dy
  163   163             self.movable_layer[sprite.x][sprite.y] = sprite
  164    -1             self.server.broadcastUpdate(
   -1   164             self.server.broadcast_update(
  165   165                 'position',
  166   166                 x=sprite.x,
  167   167                 y=sprite.y,