mirror of
https://github.com/libretro/Genesis-Plus-GX.git
synced 2024-11-27 10:31:11 +00:00
Merge branch 'ekeeke:master' into master
This commit is contained in:
commit
d0ba771160
Binary file not shown.
Binary file not shown.
Before Width: | Height: | Size: 3.8 MiB After Width: | Height: | Size: 3.8 MiB |
Binary file not shown.
Before Width: | Height: | Size: 4.0 MiB After Width: | Height: | Size: 4.0 MiB |
@ -634,13 +634,8 @@ void OPLL_EnvelopeGenerate(opll_t *chip) {
|
||||
switch (state) {
|
||||
case eg_num_attack:
|
||||
if (!chip->eg_maxrate && (chip->eg_kon & 2) && !zero) {
|
||||
int32_t shift = chip->eg_rate_hi - 11 + chip->eg_inc_hi;
|
||||
if (chip->eg_inc_lo) {
|
||||
shift = 1;
|
||||
}
|
||||
int32_t shift = (chip->eg_rate_hi < 12) ? chip->eg_inc_lo : (chip->eg_rate_hi - 11 + chip->eg_inc_hi);
|
||||
if (shift > 0) {
|
||||
if (shift > 4)
|
||||
shift = 4;
|
||||
step = ~level >> (5 - shift);
|
||||
}
|
||||
}
|
||||
|
@ -103,7 +103,7 @@ typedef struct
|
||||
UINT8 eg_sh_dp; /* (dump state) */
|
||||
UINT8 eg_sel_dp; /* (dump state) */
|
||||
UINT8 eg_sh_ar; /* (attack state) */
|
||||
UINT8 eg_sel_ar; /* (attack state) */
|
||||
UINT16 eg_sel_ar; /* (attack state) */
|
||||
UINT8 eg_sh_dr; /* (decay state) */
|
||||
UINT8 eg_sel_dr; /* (decay state) */
|
||||
UINT8 eg_sh_rr; /* (release state for non-perc.) */
|
||||
|
Loading…
Reference in New Issue
Block a user