From d76484d23cb8ac0165e97ee86394a595ecbc344b Mon Sep 17 00:00:00 2001
From: troido <troido@hotmail.com>
Date: Wed, 3 Jan 2018 20:58:26 +0100
Subject: fixed long lines messing up chat. fixed global chat

---
 asciifarm/client/display/messagepad.py | 3 ++-
 asciifarm/client/gameclient.py         | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/asciifarm/client/display/messagepad.py b/asciifarm/client/display/messagepad.py
index 88ac3b4..4992b15 100644
--- a/asciifarm/client/display/messagepad.py
+++ b/asciifarm/client/display/messagepad.py
@@ -49,7 +49,8 @@ class MessagePad():
         elif len(lines) < height:
             lines = (height-len(lines)) * [""] + lines
         win.erase()
-        win.addLine((0,0),'\n'.join(lines))
+        for i, line in enumerate(lines):
+            win.addLine((0,i),line)
         if moreUp:
             win.addLine((width-1, 0), '-')
         if moreDown:
diff --git a/asciifarm/client/gameclient.py b/asciifarm/client/gameclient.py
index 7652f66..6f85e0d 100644
--- a/asciifarm/client/gameclient.py
+++ b/asciifarm/client/gameclient.py
@@ -63,6 +63,8 @@ class Client:
                 if error == "nametaken":
                     print("error: name is already taken", file=sys.stderr)
                     self.close()
+                    return
+                self.log(error)
             if msgType == 'field':
                 field = msg[1]
                 fieldWidth = field['width']
-- 
cgit