summaryrefslogtreecommitdiff
path: root/soundlib/modcommand.cpp
diff options
context:
space:
mode:
authorJames Cowgill <jcowgill@debian.org>2018-12-23 22:09:29 +0000
committerJames Cowgill <jcowgill@debian.org>2018-12-23 22:09:29 +0000
commitfa977e826b34fe2fcfeb253f50d8def6127068b6 (patch)
treed0e1cd7cdc903a5c858d2339ec4a359c6b7a9903 /soundlib/modcommand.cpp
parentdb8e0c1070c79653be541929205e7b7004d43663 (diff)
New upstream version 0.4.0
Diffstat (limited to 'soundlib/modcommand.cpp')
-rw-r--r--soundlib/modcommand.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/soundlib/modcommand.cpp b/soundlib/modcommand.cpp
index b3eadec..4d11e00 100644
--- a/soundlib/modcommand.cpp
+++ b/soundlib/modcommand.cpp
@@ -79,6 +79,7 @@ void ModCommand::ExtendedMODtoS3MEffect()
command = CMD_S3MCMDEX;
switch(param & 0xF0)
{
+ case 0x00: command = CMD_NONE; break; // No filter control
case 0x10: command = CMD_PORTAMENTOUP; param |= 0xF0; break;
case 0x20: command = CMD_PORTAMENTODOWN; param |= 0xF0; break;
case 0x30: param = (param & 0x0F) | 0x10; break;
@@ -320,12 +321,12 @@ void ModCommand::Convert(MODTYPE fromType, MODTYPE toType, const CSoundFile &snd
{
if(note == NOTE_NOTECUT)
{
- // convert note cut to EC0 if possible or volume command otherwise (MOD/XM has no real way of cutting notes that cannot be "undone" by volume commands)
+ // convert note cut to C00 if possible or volume command otherwise (MOD/XM has no real way of cutting notes that cannot be "undone" by volume commands)
note = NOTE_NONE;
if(command == CMD_NONE || !newTypeIsXM)
{
- command = CMD_MODCMDEX;
- param = 0xC0;
+ command = CMD_VOLUME;
+ param = 0;
} else
{
volcmd = VOLCMD_VOLUME;