Merge: Beef up OrderedTree API

[nit.git] / contrib / friendz / src / grid.nit

diff --git a/contrib/friendz/src/grid.nit b/contrib/friendz/src/grid.nit
index 3b4fad9..6f1c883 100644 (file)
--- a/contrib/friendz/src/grid.nit
+++ b/contrib/friendz/src/grid.nit
@@ -249,13 +249,13 @@ class Grid
                                else if c >= 'A' and c <= 'I' then
                                        var t = self.get(x,y)
                                        assert t != null
-                                       t.update(c.ascii-'A'.ascii+1)
+                                       t.update(c.code_point-'A'.code_point+1)
                                        t.fixed = true
                                        x += 1
                                else if c >= 'a' and c <= 'i' then
                                        var t = self.get(x,y)
                                        assert t != null
-                                       t.update(c.ascii-'a'.ascii+1)
+                                       t.update(c.code_point-'a'.code_point+1)
                                        x += 1
                                else if c >= '1' and c <= '9' then
                                        rle = c.to_i
@@ -267,7 +267,7 @@ class Grid
                if x>0 then y += 1
                if x > mx then mx = x
                if y > my then my = y
-               if mx<3 or my<3 or mx>=max_width or my>=max_height then
+               if mx<3 or my<3 or mx>max_width or my>max_height then
                        return false
                end
                self.resize(mx,my)
@@ -289,16 +289,16 @@ class Grid
                                if k == 0 then
                                        if t.fixed then c = '#'
                                else
-                                       b.add(0x1b.ascii)
+                                       b.add(0x1b.code_point)
                                        b.add('[')
                                        b.append ansicols[k]
-                                       c = (k + 'a'.ascii - 1).ascii
+                                       c = (k + 'a'.code_point - 1).code_point
                                        if t.fixed then c = c.to_upper
                                        b.append("m")
                                end
                                b.add(c)
                                if k != 0 then
-                                       b.add(0x1b.ascii)
+                                       b.add(0x1b.code_point)
                                        b.append("[0m")
 
                                end