Envelope fix

libmikmod/include/mikmod_internals.h

@@ -424,6 +424,7 @@ typedef struct FILTER {
 #define EF_SUSTAIN      2
 #define EF_LOOP         4
 #define EF_VOLENV       8
+#define EF_ITMODE       16
 
 /* New Note Action Flags */
 #define NNA_CUT         0
@@ -461,22 +462,23 @@ typedef struct FILTER {
 #define LAST_PATTERN    (UWORD)(-1) /* special ``end of song'' pattern */
 
 typedef struct ENVPR {
-    UBYTE  flg;     /* envelope flag */
-    UBYTE  pts;     /* number of envelope points */
-    UBYTE  susbeg;  /* envelope sustain index begin */
-    UBYTE  susend;  /* envelope sustain index end */
-    UBYTE  beg;     /* envelope loop begin */
-    UBYTE  end;     /* envelope loop end */
-    SWORD  p;       /* current envelope counter */
-    UWORD  a;       /* envelope index a */
-    UWORD  b;       /* envelope index b */
-    ENVPT* env;     /* envelope points */
+    UBYTE  flg;         /* envelope flag */
+    UBYTE  pts;         /* number of envelope points */
+    UBYTE  susbeg;      /* envelope sustain index begin */
+    UBYTE  susend;      /* envelope sustain index end */
+    UBYTE  loopbeg;     /* envelope loop begin */
+    UBYTE  loopend;     /* envelope loop end */
+    SWORD  tick;        /* current envelope counter */
+    UWORD  index;       /* envelope index for the point after the current one */
+    BOOL   interpolate; /* Indicate if interpolation should be done */
+    SWORD  lastvalue;   /* the last calculated value */
+    ENVPT* env;         /* envelope points */
 } ENVPR;
 
 typedef struct MP_CHANNEL {
     INSTRUMENT* i;
     SAMPLE *s;
-    UBYTE  sample;      /* which sample number */
+    SBYTE  sample;      /* which sample number, -1 if illegal instrument has been set */
     UBYTE  note;        /* the audible note as heard, direct rep of period */
     SWORD  outvolume;   /* output volume (vol + sampcol + instvol) */
     SBYTE  chanvol;     /* channel's "global" volume */
@@ -590,6 +592,8 @@ typedef struct MP_VOICE {
     ENVPR   penv;
     ENVPR   cenv;
 
+    SWORD   envstartpos;/* Start position for envelopes set by XM effect L */
+
     UWORD   avibpos;    /* autovibrato pos */
     UWORD   aswppos;    /* autovibrato sweep pos */
 

libmikmod/loaders/load_it.c

@@ -827,7 +827,9 @@ static BOOL IT_Load(BOOL curious)
 				return 0;
 			}
 
-			d->volflg|=EF_VOLENV;
+			d->volflg|=(EF_VOLENV | EF_ITMODE);
+			d->panflg|=EF_ITMODE;
+			d->pitflg|=EF_ITMODE;
 			d->insname = DupStr(ih.name,26,0);
 			d->nnatype = ih.nna & NNA_MASK;