--- np2/statsave.c 2005/03/22 04:39:07 1.48 +++ np2/statsave.c 2007/11/03 00:00:19 1.51 @@ -892,7 +892,7 @@ static int flagload_fm(STFLAGH sfh, cons OPNKEY opnkey; ret = statflag_read(sfh, &usesound, sizeof(usesound)); - fmboard_reset(usesound); + fmboard_reset(&np2cfg, usesound); switch(usesound) { case 0x01: @@ -1456,9 +1456,9 @@ const SFENTRY *tblterm; sound_reset(); fddmtrsnd_bind(); - iocore_reset(); // サウンドでpicを呼ぶので… - cbuscore_reset(); - fmboard_reset(pccore.sound); + iocore_reset(&np2cfg); // サウンドでpicを呼ぶので… + cbuscore_reset(&np2cfg); + fmboard_reset(&np2cfg, pccore.sound); done = FALSE; while((!done) && (ret != STATFLAG_FAILURE)) { @@ -1551,7 +1551,7 @@ const SFENTRY *tblterm; statflag_close(sffh); // I/O作り直し - i286_memorymap((pccore.model & PCMODEL_EPSON)?1:0); + MEMM_ARCH((pccore.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -1568,7 +1568,8 @@ const SFENTRY *tblterm; FONTPTR_LOW = fontrom + cgwindow.low; FONTPTR_HIGH = fontrom + cgwindow.high; #endif - i286_vram_dispatch(vramop.operate); + MEMM_VRAM(vramop.operate); + fddmtr_reset(); soundmng_play(); return(ret);