From 9bf2296a2e71791059539523c192a37a65039bd9 Mon Sep 17 00:00:00 2001 From: David Griffith Date: Sun, 26 Feb 2017 19:59:27 -0800 Subject: [PATCH] Move Blorb stuff out of ux_setup.h and into ux_blorb.h. Fix ux_audio.c to work with this. --- src/curses/ux_audio.c | 1 + src/curses/ux_blorb.h | 4 ++++ src/curses/ux_frotz.h | 8 ++++---- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c index e902675..6765ae9 100644 --- a/src/curses/ux_audio.c +++ b/src/curses/ux_audio.c @@ -37,6 +37,7 @@ #endif #include "ux_frotz.h" +#include "ux_blorb.h" #include "ux_locks.h" #ifndef NO_SOUND diff --git a/src/curses/ux_blorb.h b/src/curses/ux_blorb.h index 95a7aa6..18aac1b 100644 --- a/src/curses/ux_blorb.h +++ b/src/curses/ux_blorb.h @@ -25,6 +25,10 @@ typedef struct { FILE *fp; } myresource; +extern bb_err_t blorb_err; +extern bb_map_t *blorb_map; +extern bb_result_t blorb_res; +extern FILE *blorb_fp; bb_err_t ux_blorb_init(char *); void ux_blorb_stop(void); diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h index f40ddd4..7247075 100644 --- a/src/curses/ux_frotz.h +++ b/src/curses/ux_frotz.h @@ -80,10 +80,10 @@ extern f_setup_t f_setup; extern u_setup_t u_setup; /*** Blorb related stuff ***/ -extern bb_err_t blorb_err; -extern bb_map_t *blorb_map; -extern bb_result_t blorb_res; -extern FILE *blorb_fp; +//extern bb_err_t blorb_err; +//extern bb_map_t *blorb_map; +//extern bb_result_t blorb_res; +//extern FILE *blorb_fp; /*** Functions specific to the Unix port of Frotz ***/ -- 2.34.1