X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=interpreters%2Fnitfol%2Fio.c;h=dafa47aa2071e45eb72e1a5e7f453a6334c7170a;hb=1176f89bd245d6b6e8120e9fff55550eae733fbb;hp=ee297990d92fe0317514dbce72c0bfd11fde64da;hpb=a4b4a0d510627f2d1404e5240c9ff6ce295cc901;p=projects%2Fchimara%2Fchimara.git diff --git a/interpreters/nitfol/io.c b/interpreters/nitfol/io.c index ee29799..dafa47a 100644 --- a/interpreters/nitfol/io.c +++ b/interpreters/nitfol/io.c @@ -18,7 +18,7 @@ The author can be reached at nitfol@deja.com */ #include "nitfol.h" -#include "nio.h" +#include "io.h" #ifdef HEADER @@ -502,7 +502,7 @@ void z_kill_window(zwinid win) void kill_windows(void) { int i; - + for(i = 0; i < num_z_windows; i++) z_clear_window(&game_windows[i]); @@ -688,7 +688,7 @@ void z_flush_fixed(zwinid window) if(window->biggest_height > window->last_height && window->biggest_height > window->height) end_line = window->biggest_height; - + /* For v3 games, there's a callback function to draw the room name and score; if this is present, we start drawing at a lower position */ start_line = 0; @@ -697,15 +697,8 @@ void z_flush_fixed(zwinid window) end_line += start_line; o = glk_window_get_parent(window->win); -#if 0 - glk_window_get_size(window->win, &winx, &winy); - if (!(window->method & winmethod_Above || window->method & winmethod_Below) - || winy != end_line) - glk_window_set_arrangement(o, window->method, - end_line, window->win); -#else - glk_window_set_arrangement(o, window->method, end_line, window->win); -#endif + glk_window_set_arrangement(o, window->method, + end_line, window->win); glk_window_get_size(window->win, &winx, &winy); if(window->draw_callback) {