Merge branch 'master' into n163

This commit is contained in:
cam900 2022-03-23 03:26:09 +09:00 committed by GitHub
commit 73267444fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 748 additions and 2 deletions

View file

@ -1588,7 +1588,7 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_AY8930) {
dutyMax=255;
}
if (ins->type==DIV_INS_TIA || ins->type==DIV_INS_AMIGA || ins->type==DIV_INS_SCC || ins->type==DIV_INS_PET) {
if (ins->type==DIV_INS_TIA || ins->type==DIV_INS_AMIGA || ins->type==DIV_INS_SCC || ins->type==DIV_INS_PET || ins->type==DIV_INS_VIC) {
dutyMax=0;
}
if (ins->type==DIV_INS_PCE) {
@ -1617,7 +1617,7 @@ void FurnaceGUI::drawInsEdit() {
bitMode=true;
}
if (ins->type==DIV_INS_STD) waveMax=0;
if (ins->type==DIV_INS_TIA) waveMax=15;
if (ins->type==DIV_INS_TIA || ins->type==DIV_INS_VIC) waveMax=15;
if (ins->type==DIV_INS_C64) waveMax=4;
if (ins->type==DIV_INS_SAA1099) waveMax=2;
if (ins->type==DIV_INS_FM || ins->type==DIV_INS_OPLL || ins->type==DIV_INS_OPL || ins->type==DIV_INS_OPZ) waveMax=0;