From: Timo Korvola <tkorvola@iki.fi>
Date: Sat, 27 Jan 2018 18:26:45 +0000 (+0200)
Subject: Merge branch 'master' into resize
X-Git-Url: https://scope-eye.net/git/?a=commitdiff_plain;h=3ac7e9be876cd7b9d5f36c24d5f7909fd3aef80b;p=liskon_frotz.git

Merge branch 'master' into resize
---

3ac7e9be876cd7b9d5f36c24d5f7909fd3aef80b
diff --cc src/curses/ux_init.c
index f930769,6e6057f..09fea50
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@@ -45,19 -45,6 +45,9 @@@
  #include "ux_frotz.h"
  #include "ux_blorb.h"
  
- f_setup_t f_setup;
- u_setup_t u_setup;
- 
 +volatile sig_atomic_t terminal_resized = 0;
 +
- static int getconfig(char *);
- static int geterrmode(char *);
- static int getcolor(char *);
- static int getbool(char *);
- 
 +static void sigwinch_handler(int);
- static void sigint_handler(int);
- 
  #define INFORMATION "\
  An interpreter for all Infocom and other Z-Machine games.\n\
  \n\