Merge branch 'accurate' into portable

This commit is contained in:
Clownacy 2020-06-30 21:36:48 +01:00
commit 99fa3868d3

View file

@ -204,7 +204,7 @@ void ChangeOrganPan(unsigned char key, unsigned char pan, signed char track) //
if (!audio_backend_initialised) if (!audio_backend_initialised)
return; return;
if (old_key[track] != PANDUMMY) if (old_key[track] != KEYDUMMY)
AudioBackend_SetSoundPan(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], (pan_tbl[pan] - 0x100) * 10); AudioBackend_SetSoundPan(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], (pan_tbl[pan] - 0x100) * 10);
} }
@ -213,7 +213,7 @@ void ChangeOrganVolume(int no, long volume, signed char track) // 300がMAXで30
if (!audio_backend_initialised) if (!audio_backend_initialised)
return; return;
if (old_key[track] != VOLDUMMY) if (old_key[track] != KEYDUMMY)
AudioBackend_SetSoundVolume(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], (volume - 0xFF) * 8); AudioBackend_SetSoundVolume(lpORGANBUFFER[track][old_key[track] / 12][key_twin[track]], (volume - 0xFF) * 8);
} }