Merge from trunk

This commit is contained in:
SarahW 2019-04-24 12:51:38 +01:00
commit f23dc883fc
22 changed files with 5195 additions and 36 deletions

View file

@ -322,6 +322,7 @@ void loadnvr()
case ROM_IBMPS2_M70_TYPE4: f = nvrfopen("ibmps2_m70_type4.nvr","rb"); break;
case ROM_TULIP_TC7: f = nvrfopen("tulip_tc7.nvr", "rb"); break;
case ROM_PB410A: f = nvrfopen("pb410a.nvr", "rb"); nvrmask = 127; break;
case ROM_BULL_MICRAL_45: f = nvrfopen("bull_micral_45.nvr", "rb"); break;
case ROM_FIC_VA503P: f = nvrfopen("fic_va503p.nvr", "rb"); nvrmask = 127; break;
default: return;
@ -421,6 +422,7 @@ void savenvr()
case ROM_IBMPS2_M70_TYPE4: f = nvrfopen("ibmps2_m70_type4.nvr","wb"); break;
case ROM_TULIP_TC7: f = nvrfopen("tulip_tc7.nvr", "wb"); break;
case ROM_PB410A: f = nvrfopen("pb410a.nvr", "wb"); break;
case ROM_BULL_MICRAL_45: f = nvrfopen("bull_micral_45.nvr", "wb"); break;
case ROM_FIC_VA503P: f = nvrfopen("fic_va503p.nvr", "wb"); break;
default: return;