diff options
| author | Norbert Lange | 2009-06-12 14:02:21 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-06-12 14:02:21 +0000 |
| commit | 14f1960c8fd2a012de8c800143a8c9cbed9b8afb (patch) | |
| tree | 1955b260cde27a2b5a4e04850cb4e54a11a6e0fb /sound/mods | |
| parent | ef7840994da935495a7f68cd376c3f2341f4f706 (diff) | |
| download | scummvm-rg350-14f1960c8fd2a012de8c800143a8c9cbed9b8afb.tar.gz scummvm-rg350-14f1960c8fd2a012de8c800143a8c9cbed9b8afb.tar.bz2 scummvm-rg350-14f1960c8fd2a012de8c800143a8c9cbed9b8afb.zip | |
sdl.cpp, main.cpp:
Made modifications dependend on compiletime-variable TFMX_CMDLINE_TOOL.
scumm.vcproj, scummvm-tfmx.sln, scummvm-tfmx.vcproj:
enabled Scumm-Engine
tfmx.cpp:
Some small cleanups and corrections
svn-id: r41478
Diffstat (limited to 'sound/mods')
| -rw-r--r-- | sound/mods/tfmx.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/sound/mods/tfmx.cpp b/sound/mods/tfmx.cpp index f3d87df1b2..16f7f19b91 100644 --- a/sound/mods/tfmx.cpp +++ b/sound/mods/tfmx.cpp @@ -281,6 +281,7 @@ FORCEINLINE bool Tfmx::macroStep(ChannelContext &channel) { case 0x07: // Stop Macro channel.macroRun = false; + --channel.macroStep; return false; case 0x08: // AddNote. Parameters: Note, Finetune(W) @@ -403,9 +404,6 @@ FORCEINLINE bool Tfmx::macroStep(ChannelContext &channel) { return channel.deferWait; case 0x1B: // Random play. Parameters: macro/speed/mode - macroPtr[1]; - macroPtr[2]; - macroPtr[3]; warnMacroUnimplemented(macroPtr, 0); return true; @@ -527,6 +525,7 @@ FORCEINLINE bool Tfmx::patternStep(PatternContext &pattern) { switch (pattCmd & 0xF) { case 0: // End Pattern + Next Trackstep pattern.command = 0xFF; + --pattern.step; _playerCtx.pendingTrackstep = true; return false; @@ -553,14 +552,17 @@ FORCEINLINE bool Tfmx::patternStep(PatternContext &pattern) { // FT case 4: // Stop this pattern pattern.command = 0xFF; + --pattern.step; // TODO: try figuring out if this was the last Channel? return false; case 5: // Kup^-Set key up - // TODO: add expose? + if (!_channelCtx[patternPtr[2] % kNumVoices].sfxLocked) + _channelCtx[patternPtr[2] % kNumVoices].keyUp = false; + return true; + case 6: // Vibrato case 7: // Envelope - case 12: // Lock noteCommand(pattCmd, patternPtr[1], patternPtr[2], patternPtr[3]); return true; @@ -582,6 +584,12 @@ FORCEINLINE bool Tfmx::patternStep(PatternContext &pattern) { target.loopCount = 0xFF; } return true; + + case 12: // Lock + _channelCtx[patternPtr[2] % kNumVoices].sfxLocked = (patternPtr[1] != 0); + _channelCtx[patternPtr[2] % kNumVoices].sfxLockTime = patternPtr[3]; + return true; + case 13: // Cue return true; case 15: // NOP |