Added useful Blorb-handling changes.

diff --git a/src/curses/ux_blorb.c b/src/curses/ux_blorb.c
index db7ec07a104baa77627ba07150b1e36eb6213cc2..121bb273d1c45aa6d7ac71760848598dfe1598f0 100644 (file)
--- a/src/curses/ux_blorb.c
+++ b/src/curses/ux_blorb.c
@@ -128,7 +128,13 @@ bb_err_t ux_blorb_init(char *filename)
      */
     if (f_setup.exec_in_blorb) {
        blorb_err = bb_load_chunk_by_type(blorb_map, bb_method_FilePos,
-               &blorb_res, bb_make_id('Z','C','O','D'), 0);
+                &blorb_res, bb_ID_Exec, 0);
+
+       printf("blorb_err %d\n", blorb_err);
+       exit(2);
+
+       blorb_err = bb_load_chunk_by_type(blorb_map, bb_method_FilePos,
+               &blorb_res, bb_ID_ZCOD, 0);
        f_setup.exec_in_blorb = 1;
     }
 

diff --git a/src/curses/ux_blorb.h b/src/curses/ux_blorb.h
index 4c02d51bd0e1735eac3a5390e2978a41e67df835..5245bbb3123f8b61f719cf9043e6bb669ea177c0 100644 (file)
--- a/src/curses/ux_blorb.h
+++ b/src/curses/ux_blorb.h
@@ -8,6 +8,10 @@
 #include "../blorb/blorb.h"
 #include "../blorb/blorblow.h"
 
+#define bb_ID_ZCOD     (bb_make_id('Z','C','O','D'))
+#define bb_ID_FORM     (bb_make_id('F','O','R','M'))
+#define bb_ID_MOD      (bb_make_id('M','O','D',' '))
+#define bb_ID_OGGV     (bb_make_id('O','G','G','V'))
 
 typedef struct sampledata_struct {
        unsigned short channels;

diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index 6c2a3a4d1c59420deb4dcd186edde951d663207f..98aa140fdee564cfcf5e567e3dd63b959ac30fb7 100644 (file)
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@ -622,7 +622,7 @@ FILE *os_load_story(void)
          printf("Blorb file loaded, but unable to build map.\n\n");
          break;
        case bb_err_NotFound:
-         printf("Blorb file loaded, but lacks executable chunk.\n\n");
+         printf("Blorb file loaded, but lacks ZCOD executable chunk.\n\n");
          break;
        case bb_err_None:
 //       printf("No blorb errors.\n\n");