Move Blorb stuff out of ux_setup.h and into ux_blorb.h. Fix ux_audio.c to work with...

diff --git a/src/curses/ux_audio.c b/src/curses/ux_audio.c
index e9026758ea07e312b7192a422b4453c2847d845d..6765ae92ed3a0eb37e301f3d0c1c45016de7a64a 100644 (file)
--- 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 95a7aa6cc7505ab440bc766c24241f6112c1ef57..18aac1b1bfabce685caaa52a3bc0cab4b5c77d69 100644 (file)
--- 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 f40ddd4b35cb6ad34d303fe006a163b67248b249..7247075cd41461c4511ffc95fa2c8dd81cd0a4ed 100644 (file)
--- 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 ***/