merged master changes from today into package branch

1 files changed, 3 insertions, 3 deletions

diff --git a/asciifarm/client/display/fieldpad.py b/asciifarm/client/display/fieldpad.py
index 461cb57..8d177d5 100644
--- a/asciifarm/client/display/fieldpad.py
+++ b/asciifarm/client/display/fieldpad.py
@@ -17,11 +17,11 @@ class FieldPad:
     
     def resize(self, width, height):
         self.size = (width, height)
-        self.pad.resize(height+1, width*self.charSize1)
+        self.pad.resize(height+1, width*self.charSize+1)
     
-    def changeCell(self, x, y, char, colour=None):
+    def changeCell(self, x, y, char, colour=None, bgcolour=0):
         if colour != None and self.colours:
-            self.pad.addstr(y, x*self.charSize, char, curses.color_pair(colour))
+            self.pad.addstr(y, x*self.charSize, char, self.colours.get(colour, bgcolour))
         else:
             self.pad.addstr(y, x*self.charSize, char)
         self.changed = True