From 6ea578a23e05f1aaf574a1a065d114c13e681355 Mon Sep 17 00:00:00 2001 From: Chris Moeller Date: Fri, 15 Aug 2014 05:26:16 -0700 Subject: [PATCH] Updated ft2play to version 0.65 --- Frameworks/modplay/modplay/ft2play.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Frameworks/modplay/modplay/ft2play.c b/Frameworks/modplay/modplay/ft2play.c index 2f6848262..dfadc2c89 100644 --- a/Frameworks/modplay/modplay/ft2play.c +++ b/Frameworks/modplay/modplay/ft2play.c @@ -1,6 +1,6 @@ /* -** FT2PLAY v0.64 -** ============= +** FT2PLAY v0.65 - 15th of August 2014 +** =================================== ** ** C port of FastTracker II's replayer, by 8bitbubsy (Olav Sorensen) ** using the original pascal+asm source codes by Mr.H (Fredrik Huss) @@ -632,7 +632,7 @@ static void StartTone(PLAYER *p, uint8_t Ton, uint8_t EffTyp, uint8_t Eff, StmTy if (Ton) { - tmpTon = (((Ton - 1) & 0x00FF) << 4) + (((ch->FineTune / 8) + 16) & 0x00FF); + tmpTon = (((Ton - 1) & 0x00FF) << 4) + (((ch->FineTune >> 3) + 16) & 0x00FF); if (tmpTon < ((12 * 10 * 16) + 16)) /* should never happen, but FT2 does this check */ { @@ -1178,7 +1178,7 @@ static void fixTonePorta(PLAYER *pl, StmTyp *ch, TonTyp *p, uint8_t inst) } else { - portaTmp = ((((p->Ton - 1) + ch->RelTonNr) & 0x00FF) << 4) + (((ch->FineTune / 8) + 16) & 0x00FF); + portaTmp = ((((p->Ton - 1) + ch->RelTonNr) & 0x00FF) << 4) + (((ch->FineTune >> 3) + 16) & 0x00FF); if (portaTmp < ((12 * 10 * 16) + 16)) { @@ -1553,7 +1553,7 @@ static int16_t RelocateTon(PLAYER *p, int16_t inPeriod, int8_t addNote, StmTyp * uint16_t middle; uint16_t upper; - fineTune = ch->FineTune / 8; // -16..15 + fineTune = ch->FineTune >> 3; // -16..15 lower = 0; upper = 8 * 12 * 16;