ref: e84e1824fbd0b2b690bd9beb2e25fd308e661982
parent: 22e82be0a7b0a915a2669e8f4ff889a938a7bfcb
author: Chris Moeller <kode54@gmail.com>
date: Sun Sep 9 07:23:47 EDT 2012
Fixed envelopes so they only carry from the same channel
--- a/dumb/src/it/itrender.c
+++ b/dumb/src/it/itrender.c
@@ -1600,7 +1600,7 @@
nna = channel->playing->instrument->new_note_action;
#endif
- if ((sigdata->flags & IT_USE_INSTRUMENTS) && (channel->playing->enabled_envelopes) && channel->playing->instnum == channel->instrument) {
+ if (!(channel->playing->flags & IT_PLAYING_DEAD) && (sigdata->flags & IT_USE_INSTRUMENTS) && (channel->playing->enabled_envelopes) && channel->playing->instnum == channel->instrument) {
IT_PLAYING * playing = channel->playing;
IT_INSTRUMENT * inst = &sigdata->instrument[channel->instrument-1];
if ((playing->enabled_envelopes & IT_ENV_VOLUME) && (inst->volume_envelope.flags & IT_ENVELOPE_CARRY)) {
@@ -1721,7 +1721,8 @@
if (!flags && sigdata->flags & IT_USE_INSTRUMENTS) {
for (i = 0; i < DUMB_IT_N_NNA_CHANNELS; i++) {
IT_PLAYING * playing = sigrenderer->playing[i];
- if (playing && (playing->enabled_envelopes) && playing->instnum == channel->instrument) {
+ if (!playing || playing->channel != channel) continue;
+ if (playing->enabled_envelopes && playing->instnum == channel->instrument) {
IT_INSTRUMENT * inst = &sigdata->instrument[channel->instrument-1];
if ((playing->enabled_envelopes & IT_ENV_VOLUME) && (inst->volume_envelope.flags & IT_ENVELOPE_CARRY)) {
flags |= 1;