1.1 --- a/src/loader.c	Tue Jun 27 09:33:12 2006 +0000
     1.2 +++ b/src/loader.c	Tue Jun 27 09:34:27 2006 +0000
     1.3 @@ -1,5 +1,5 @@
     1.4  /**
     1.5 - * $Id: loader.c,v 1.12 2006-03-15 13:17:40 nkeynes Exp $
     1.6 + * $Id: loader.c,v 1.13 2006-06-27 09:34:27 nkeynes Exp $
     1.7   *
     1.8   * File loading routines, mostly for loading demos without going through the
     1.9   * whole procedure of making a CD image for them.
    1.10 @@ -27,8 +27,8 @@
    1.11  #include "mem.h"
    1.12  #include "sh4core.h"
    1.13  #include "bootstrap.h"
    1.14 +#include "dreamcast.h"
    1.15  
    1.16 -char *bootstrap_file = DEFAULT_BOOTSTRAP_FILE;
    1.17  char bootstrap_magic[32] = "SEGA SEGAKATANA SEGA ENTERPRISES";
    1.18  char iso_magic[6] = "\001CD001";
    1.19  char *file_loader_extensions[][2] = { 
    1.20 @@ -78,7 +78,7 @@
    1.21              char *load = mem_get_region( BOOTSTRAP_LOAD_ADDR );
    1.22              lseek( fd, 0, SEEK_SET );
    1.23              read( fd, load, BOOTSTRAP_SIZE );
    1.24 -            bootstrap_dump( load );
    1.25 +            bootstrap_dump( load, TRUE );
    1.26              sh4_set_pc( BOOTSTRAP_LOAD_ADDR + 0x300 );
    1.27              gtk_gui_update();
    1.28          } else {
    1.29 @@ -109,6 +109,7 @@
    1.30  
    1.31  int file_load_postload( int pc )
    1.32  {
    1.33 +    const gchar *bootstrap_file = dreamcast_get_config_value(CONFIG_BOOTSTRAP);
    1.34      if( bootstrap_file != NULL ) {
    1.35  	/* Load in a bootstrap before the binary, to initialize everything
    1.36  	 * correctly