It's a new year.

[sgt/puzzles] / osx.m

diff --git a/osx.m b/osx.m
index e7da743..bbe47f3 100644 (file)
--- a/osx.m
+++ b/osx.m
@@ -524,7 +524,7 @@ struct frontend {
 
     fe.window = self;
 
-    me = midend_new(&fe, ourgame, osx_drawing, &fe);
+    me = midend_new(&fe, ourgame, &osx_drawing, &fe);
     /*
      * If we ever need to open a fresh window using a provided game
      * ID, I think the right thing is to move most of this method
@@ -540,7 +540,7 @@ struct frontend {
     /*
      * Create the status bar, which will just be an NSTextField.
      */
-    if (ourgame->wants_statusbar()) {
+    if (midend_wants_statusbar(me)) {
        status = [[NSTextField alloc] initWithFrame:NSMakeRect(0,0,100,50)];
        [status setEditable:NO];
        [status setSelectable:NO];
@@ -1341,6 +1341,8 @@ static void osx_draw_text(void *handle, int x, int y, int fonttype,
        point.x -= size.width / 2;
     if (align & ALIGN_VCENTRE)
        point.y -= size.height / 2;
+    else
+       point.y -= size.height;
 
     [string drawAtPoint:point withAttributes:attr];
 }
@@ -1379,7 +1381,7 @@ static void osx_blitter_save(void *handle, blitter *bl, int x, int y)
 }
 static void osx_blitter_load(void *handle, blitter *bl, int x, int y)
 {
-    frontend *fe = (frontend *)handle;
+    /* frontend *fe = (frontend *)handle; */
     if (x == BLITTER_FROMSAVED && y == BLITTER_FROMSAVED) {
         x = bl->x;
         y = bl->y;
@@ -1431,7 +1433,7 @@ const struct drawing_api osx_drawing = {
     osx_draw_text,
     osx_draw_rect,
     osx_draw_line,
-    osx_draw_poly,
+    osx_draw_polygon,
     osx_draw_circle,
     osx_draw_update,
     osx_clip,