From 6bafddccc559b0da90a044e38d5ddc015c64dbfb Mon Sep 17 00:00:00 2001 From: David Griffith Date: Sun, 12 Aug 2012 22:38:12 -0700 Subject: [PATCH] Zcode loads and executes from Blorb files --- src/common/fastmem.c | 4 ++++ src/curses/ux_init.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/fastmem.c b/src/common/fastmem.c index 4c295a1..07a254e 100644 --- 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 0f6a2ea..c5d5aa0 100644 --- 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; } -- 2.34.1