Zcode loads and executes from Blorb files

diff --git a/src/common/fastmem.c b/src/common/fastmem.c
index 4c295a148ffe476ef6a88949c9899f330cd4655e..07a254e9840d48cdbc442514eddc60c59b5ac5f4 100644 (file)
--- a/src/common/fastmem.c
+++ b/src/common/fastmem.c
@@ -250,8 +250,12 @@ void init_memory (void)
 
     /* Open story file */
 
+/*
     if ((story_fp = os_path_open(f_setup.story_file, "rb")) == NULL)
        os_fatal ("Cannot open story file");
+*/
+    if ((story_fp = os_load_story()) == NULL)
+        os_fatal ("Cannot open story file");
 
     /* Allocate memory for story header */
 

diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index 0f6a2eae2c04848bb47f14c1edda2cab7810b11e..c5d5aa050171de4a47383cfe33b52649f34091bb 100644 (file)
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@ -333,7 +333,6 @@ void os_process_arguments (int argc, char *argv[])
          printf("Blorb file loaded, but unable to build map.\n\n");
          break;
     }
-
 }/* os_process_arguments */
 
 /*
@@ -598,7 +597,7 @@ FILE *os_load_story(void)
        fp = fopen(u_setup.blorb_file, "rb");
        fseek(fp, blorb_res.data.startpos, SEEK_SET);
     } else {
-       fp = fopen(f_setup.story_name, "rb");
+       fp = fopen(f_setup.story_file, "rb");
     }
     return fp;
 }