--- np2/sound/soundrom.c 2003/10/16 17:58:08 1.1.1.1 +++ np2/sound/soundrom.c 2003/10/18 01:21:58 1.2 @@ -19,11 +19,11 @@ static BOOL loadsoundrom(UINT address, c FILEH fh; UINT rsize; - milstr_ncpy(romname, file_sound, sizeof(romname)); + file_cpyname(romname, file_sound, sizeof(romname)); if (name) { - milstr_ncat(romname, name, sizeof(romname)); + file_catname(romname, name, sizeof(romname)); } - milstr_ncat(romname, file_extrom, sizeof(romname)); + file_catname(romname, file_extrom, sizeof(romname)); fh = file_open_c(romname); if (fh == FILEH_INVALID) { goto lsr_err; @@ -33,7 +33,7 @@ static BOOL loadsoundrom(UINT address, c if (rsize != 0x4000) { goto lsr_err; } - milstr_ncpy(soundrom.name, romname, sizeof(soundrom.name)); + file_cpyname(soundrom.name, romname, sizeof(soundrom.name)); soundrom.address = address; return(SUCCESS);