build fixes.

Author: sezero

libmikmod/playercode/mplayer.c

@@ -379,16 +379,17 @@ static void StartEnvelope(ENVPR *t,UBYTE flg,UBYTE pts,UBYTE susbeg,UBYTE susend
 static void SetEnvelopePosition(ENVPR *t, ENVPT *p, SWORD pos)
 {
 	if (t->flg & EF_ON) {
-		t->tick = pos - 1;
-
 		SWORD idx = 0;
 		BOOL envUpdate = TRUE;
 		SWORD tick = pos;
 
+		t->tick = pos - 1;
+
 		if (t->pts > 1)	{
+			UWORD i;
 			idx++;
 
-			for (UWORD i = 0; i < t->pts - 1; i++) {
+			for (i = 0; i < t->pts - 1; i++) {
 				if (tick < p[idx].pos) {
 					idx--;
 
@@ -446,7 +447,7 @@ static void SetPanningEnvelopePosition(MODULE *mod, INSTRUMENT *i, ENVPR *t, ENV
 /* Calculates the next envelope value the XM way, based on the implementation from ft2-clone */
 static inline void ProcessEnvelopeXm(MP_VOICE *aout, ENVPR *t)
 {
-	WORD idx = t->index;
+	UWORD idx = t->index;
 	const BOOL keyOff = aout->main.keyoff & KEY_OFF;
 
 	if (keyOff) {
@@ -506,11 +507,14 @@ static inline void ProcessEnvelopeXm(MP_VOICE *aout, ENVPR *t)
 /* Calculates the next envelope value the IT way, based on the implementation from Schismtracker */
 static inline void ProcessEnvelopeIt(MP_VOICE *aout, ENVPR *t)
 {
-	t->tick++;
-
 	SWORD start, end;
 	const BOOL keyOff = aout->main.keyoff & KEY_OFF;
 	BOOL fadeFlag = FALSE;
+	SWORD pointPos, newPos;
+	SWORD tick;
+	UWORD i, idx;
+
+	t->tick++;
 
 	if ((t->flg & EF_SUSTAIN) && !keyOff) {
 		start = t->env[t->susbeg].pos;
@@ -537,19 +541,18 @@ static inline void ProcessEnvelopeIt(MP_VOICE *aout, ENVPR *t)
 		t->tick = start;
 	}
 
-	SWORD tick = t->tick;
-	WORD idx = t->pts - 1;
+	tick = t->tick;
+	idx = t->pts - 1;
 
 	// Find the right point to use
-	for (WORD i = 0; i < t->pts - 1; i++) {
+	for (i = 0; i < t->pts - 1; i++) {
 		if (tick <= t->env[i].pos) {
 			idx = i;
 			break;
 		}
 	}
 
-	const SWORD pointPos = t->env[idx].pos;
-	SWORD newPos;
+	pointPos = t->env[idx].pos;
 
 	if (tick >= pointPos) {
 		t->lastvalue = t->env[idx].val;