aboutsummaryrefslogtreecommitdiff
path: root/sound/mods/tfmx.h
diff options
context:
space:
mode:
authorNorbert Lange2009-06-20 13:49:02 +0000
committerNorbert Lange2009-06-20 13:49:02 +0000
commitc0228cfe70d3ece58323cc92f57a0a5786c3294c (patch)
tree888db03317b9646d5d246e061e52182ba52a894a /sound/mods/tfmx.h
parent7ed1061507b569f3cede623dce7dd1f812a0e9dd (diff)
downloadscummvm-rg350-c0228cfe70d3ece58323cc92f57a0a5786c3294c.tar.gz
scummvm-rg350-c0228cfe70d3ece58323cc92f57a0a5786c3294c.tar.bz2
scummvm-rg350-c0228cfe70d3ece58323cc92f57a0a5786c3294c.zip
Some more cleanups,
fixed patterncommand 0xFE not working, added an option "-hack-patternstop" to the commandline tool svn-id: r41710
Diffstat (limited to 'sound/mods/tfmx.h')
-rw-r--r--sound/mods/tfmx.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/mods/tfmx.h b/sound/mods/tfmx.h
index 3ca1d8a4ba..195b582c69 100644
--- a/sound/mods/tfmx.h
+++ b/sound/mods/tfmx.h
@@ -202,8 +202,6 @@ public:
} _trackCtx;
struct PlayerContext {
- bool enabled;
-// bool end;
int8 song; //!< >= 0 if Song is running (means process Patterns)
uint16 patternCount;
@@ -223,7 +221,7 @@ public:
bool stopWithLastPattern; //!< hack to automatically stop the whole player if no Pattern is running
} _playerCtx;
- void initMacroProgramm(ChannelContext &channel) {
+ static void initMacroProgramm(ChannelContext &channel) {
channel.macroStep = 0;
channel.macroWait = 0;
channel.macroRun = true;
@@ -231,18 +229,18 @@ public:
channel.dmaIntCount = 0;
}
- void clearEffects(ChannelContext &channel) {
+ static void clearEffects(ChannelContext &channel) {
channel.envSkip = 0;
channel.vibLength = 0;
channel.portaDelta = 0;
}
- void clearMacroProgramm(ChannelContext &channel) {
+ static void clearMacroProgramm(ChannelContext &channel) {
channel.macroRun = false;
channel.dmaIntCount = 0;
}
- void unlockMacroChannel(ChannelContext &channel) {
+ static void unlockMacroChannel(ChannelContext &channel) {
channel.customMacro = 0;
channel.customMacroPrio = false;
channel.sfxLocked = false;