--- np2/sound/soundrom.c 2003/10/18 01:21:58 1.2 +++ np2/sound/soundrom.c 2003/12/12 01:04:41 1.7 @@ -1,6 +1,7 @@ #include "compiler.h" #include "dosio.h" -#include "memory.h" +#include "cpucore.h" +#include "pccore.h" #include "soundrom.h" @@ -16,6 +17,7 @@ static const BYTE defsoundrom[9] = { static BOOL loadsoundrom(UINT address, const char *name) { char romname[24]; + char path[MAX_PATH]; FILEH fh; UINT rsize; @@ -24,7 +26,8 @@ static BOOL loadsoundrom(UINT address, c file_catname(romname, name, sizeof(romname)); } file_catname(romname, file_extrom, sizeof(romname)); - fh = file_open_c(romname); + getbiospath(path, romname, sizeof(path)); + fh = file_open_rb(path); if (fh == FILEH_INVALID) { goto lsr_err; } @@ -64,7 +67,7 @@ void soundrom_load(UINT32 address, const soundrom.address = address; } -void soundrom_loadex(BYTE sw, const char *primary) { +void soundrom_loadex(UINT sw, const char *primary) { if (sw < 4) { soundrom_load((0xc8000 + ((UINT32)sw << 14)), primary);